diff --git a/src/main/config/es/fess_config.json b/src/main/config/es/fess_config.json index a2c344144..a4ad5a0c9 100644 --- a/src/main/config/es/fess_config.json +++ b/src/main/config/es/fess_config.json @@ -471,12 +471,12 @@ } } }, - "crawling_session_info" : { + "crawling_info_param" : { "_all" : { "enabled" : false }, "properties" : { - "crawlingSessionId" : { + "crawlingInfoId" : { "type" : "string", "index" : "not_analyzed" }, @@ -556,7 +556,7 @@ } } }, - "crawling_session" : { + "crawling_info" : { "_all" : { "enabled" : false }, diff --git a/src/main/java/org/codelibs/fess/Constants.java b/src/main/java/org/codelibs/fess/Constants.java index 913a59ae5..be9e71a3e 100644 --- a/src/main/java/org/codelibs/fess/Constants.java +++ b/src/main/java/org/codelibs/fess/Constants.java @@ -204,7 +204,7 @@ public class Constants extends CoreLibConstants { public static final String SESSION_ID = "sessionId"; - public static final String CRAWLING_SESSION_ID = "crawlingSessionId"; + public static final String CRAWLING_INFO_ID = "crawlingInfoId"; public static final String INDEXING_TARGET = "indexingTarget"; @@ -247,7 +247,7 @@ public class Constants extends CoreLibConstants { public static final String SCREEN_SHOT_PATH_CACHE = "screenShotPaths"; - public static final String CRAWLING_SESSION_SYSTEM_NAME = "system"; + public static final String CRAWLING_INFO_SYSTEM_NAME = "system"; // view parameters diff --git a/src/main/java/org/codelibs/fess/app/pager/BoostDocumentRulePager.java b/src/main/java/org/codelibs/fess/app/pager/BoostDocPager.java similarity index 98% rename from src/main/java/org/codelibs/fess/app/pager/BoostDocumentRulePager.java rename to src/main/java/org/codelibs/fess/app/pager/BoostDocPager.java index 4f8c99ffd..366cce71a 100644 --- a/src/main/java/org/codelibs/fess/app/pager/BoostDocumentRulePager.java +++ b/src/main/java/org/codelibs/fess/app/pager/BoostDocPager.java @@ -20,7 +20,7 @@ import java.util.List; import org.codelibs.fess.Constants; -public class BoostDocumentRulePager implements Serializable { +public class BoostDocPager implements Serializable { private static final long serialVersionUID = 1L; public static final int DEFAULT_CURRENT_PAGE_NUMBER = 1; diff --git a/src/main/java/org/codelibs/fess/app/pager/CrawlingSessionPager.java b/src/main/java/org/codelibs/fess/app/pager/CrawlingInfoPager.java similarity index 97% rename from src/main/java/org/codelibs/fess/app/pager/CrawlingSessionPager.java rename to src/main/java/org/codelibs/fess/app/pager/CrawlingInfoPager.java index eed8ada55..44ce59132 100644 --- a/src/main/java/org/codelibs/fess/app/pager/CrawlingSessionPager.java +++ b/src/main/java/org/codelibs/fess/app/pager/CrawlingInfoPager.java @@ -20,7 +20,7 @@ import java.util.List; import org.codelibs.fess.Constants; -public class CrawlingSessionPager implements Serializable { +public class CrawlingInfoPager implements Serializable { private static final long serialVersionUID = 1L; @@ -48,7 +48,7 @@ public class CrawlingSessionPager implements Serializable { public String createdTime; - public CrawlingSessionPager() { + public CrawlingInfoPager() { super(); } diff --git a/src/main/java/org/codelibs/fess/app/pager/FileAuthenticationPager.java b/src/main/java/org/codelibs/fess/app/pager/FileAuthPager.java similarity index 97% rename from src/main/java/org/codelibs/fess/app/pager/FileAuthenticationPager.java rename to src/main/java/org/codelibs/fess/app/pager/FileAuthPager.java index a31827b70..b48a9b892 100644 --- a/src/main/java/org/codelibs/fess/app/pager/FileAuthenticationPager.java +++ b/src/main/java/org/codelibs/fess/app/pager/FileAuthPager.java @@ -20,7 +20,7 @@ import java.util.List; import org.codelibs.fess.Constants; -public class FileAuthenticationPager implements Serializable { +public class FileAuthPager implements Serializable { private static final long serialVersionUID = 1L; @@ -140,7 +140,7 @@ public class FileAuthenticationPager implements Serializable { this.pageNumberList = pageNumberList; } - public FileAuthenticationPager() { + public FileAuthPager() { super(); } diff --git a/src/main/java/org/codelibs/fess/app/pager/PathMappingPager.java b/src/main/java/org/codelibs/fess/app/pager/PathMapPager.java similarity index 97% rename from src/main/java/org/codelibs/fess/app/pager/PathMappingPager.java rename to src/main/java/org/codelibs/fess/app/pager/PathMapPager.java index 0fdd71d9d..e58af361e 100644 --- a/src/main/java/org/codelibs/fess/app/pager/PathMappingPager.java +++ b/src/main/java/org/codelibs/fess/app/pager/PathMapPager.java @@ -20,7 +20,7 @@ import java.util.List; import org.codelibs.fess.Constants; -public class PathMappingPager implements Serializable { +public class PathMapPager implements Serializable { private static final long serialVersionUID = 1L; @@ -143,7 +143,7 @@ public class PathMappingPager implements Serializable { this.pageNumberList = pageNumberList; } - public PathMappingPager() { + public PathMapPager() { super(); } diff --git a/src/main/java/org/codelibs/fess/app/pager/RequestHeaderPager.java b/src/main/java/org/codelibs/fess/app/pager/ReqHeaderPager.java similarity index 97% rename from src/main/java/org/codelibs/fess/app/pager/RequestHeaderPager.java rename to src/main/java/org/codelibs/fess/app/pager/ReqHeaderPager.java index 757b5aba4..48da1e384 100644 --- a/src/main/java/org/codelibs/fess/app/pager/RequestHeaderPager.java +++ b/src/main/java/org/codelibs/fess/app/pager/ReqHeaderPager.java @@ -20,7 +20,7 @@ import java.util.List; import org.codelibs.fess.Constants; -public class RequestHeaderPager implements Serializable { +public class ReqHeaderPager implements Serializable { private static final long serialVersionUID = 1L; @@ -140,7 +140,7 @@ public class RequestHeaderPager implements Serializable { this.pageNumberList = pageNumberList; } - public RequestHeaderPager() { + public ReqHeaderPager() { super(); } diff --git a/src/main/java/org/codelibs/fess/app/pager/ScheduledJobPager.java b/src/main/java/org/codelibs/fess/app/pager/SchedulerPager.java similarity index 97% rename from src/main/java/org/codelibs/fess/app/pager/ScheduledJobPager.java rename to src/main/java/org/codelibs/fess/app/pager/SchedulerPager.java index 42d161fe3..5efcc5dd3 100644 --- a/src/main/java/org/codelibs/fess/app/pager/ScheduledJobPager.java +++ b/src/main/java/org/codelibs/fess/app/pager/SchedulerPager.java @@ -20,7 +20,7 @@ import java.util.List; import org.codelibs.fess.Constants; -public class ScheduledJobPager implements Serializable { +public class SchedulerPager implements Serializable { private static final long serialVersionUID = 1L; @@ -155,7 +155,7 @@ public class ScheduledJobPager implements Serializable { this.pageNumberList = pageNumberList; } - public ScheduledJobPager() { + public SchedulerPager() { super(); } diff --git a/src/main/java/org/codelibs/fess/app/pager/WebAuthenticationPager.java b/src/main/java/org/codelibs/fess/app/pager/WebAuthPager.java similarity index 97% rename from src/main/java/org/codelibs/fess/app/pager/WebAuthenticationPager.java rename to src/main/java/org/codelibs/fess/app/pager/WebAuthPager.java index c1b7cb322..f1600d983 100644 --- a/src/main/java/org/codelibs/fess/app/pager/WebAuthenticationPager.java +++ b/src/main/java/org/codelibs/fess/app/pager/WebAuthPager.java @@ -20,7 +20,7 @@ import java.util.List; import org.codelibs.fess.Constants; -public class WebAuthenticationPager implements Serializable { +public class WebAuthPager implements Serializable { private static final long serialVersionUID = 1L; @@ -140,7 +140,7 @@ public class WebAuthenticationPager implements Serializable { this.pageNumberList = pageNumberList; } - public WebAuthenticationPager() { + public WebAuthPager() { super(); } diff --git a/src/main/java/org/codelibs/fess/app/service/BoostDocumentRuleService.java b/src/main/java/org/codelibs/fess/app/service/BoostDocumentRuleService.java index 0ee137d8b..62f2a31e2 100644 --- a/src/main/java/org/codelibs/fess/app/service/BoostDocumentRuleService.java +++ b/src/main/java/org/codelibs/fess/app/service/BoostDocumentRuleService.java @@ -23,7 +23,7 @@ import javax.annotation.Resource; import org.codelibs.core.beans.util.BeanUtil; import org.codelibs.fess.Constants; -import org.codelibs.fess.app.pager.BoostDocumentRulePager; +import org.codelibs.fess.app.pager.BoostDocPager; import org.codelibs.fess.es.config.cbean.BoostDocumentRuleCB; import org.codelibs.fess.es.config.exbhv.BoostDocumentRuleBhv; import org.codelibs.fess.es.config.exentity.BoostDocumentRule; @@ -41,7 +41,7 @@ public class BoostDocumentRuleService implements Serializable { @Resource protected FessConfig fessConfig; - public List getBoostDocumentRuleList(final BoostDocumentRulePager boostDocumentRulePager) { + public List getBoostDocumentRuleList(final BoostDocPager boostDocumentRulePager) { final PagingResultBean boostDocumentRuleList = boostDocumentRuleBhv.selectPage(cb -> { cb.paging(boostDocumentRulePager.getPageSize(), boostDocumentRulePager.getCurrentPageNumber()); @@ -79,7 +79,7 @@ public class BoostDocumentRuleService implements Serializable { } - protected void setupListCondition(final BoostDocumentRuleCB cb, final BoostDocumentRulePager boostDocumentRulePager) { + protected void setupListCondition(final BoostDocumentRuleCB cb, final BoostDocPager boostDocumentRulePager) { if (boostDocumentRulePager.id != null) { cb.query().docMeta().setId_Equal(boostDocumentRulePager.id); } diff --git a/src/main/java/org/codelibs/fess/app/service/CrawlingSessionService.java b/src/main/java/org/codelibs/fess/app/service/CrawlingInfoService.java similarity index 57% rename from src/main/java/org/codelibs/fess/app/service/CrawlingSessionService.java rename to src/main/java/org/codelibs/fess/app/service/CrawlingInfoService.java index d661c8613..35cb56eba 100644 --- a/src/main/java/org/codelibs/fess/app/service/CrawlingSessionService.java +++ b/src/main/java/org/codelibs/fess/app/service/CrawlingInfoService.java @@ -38,12 +38,12 @@ import org.codelibs.core.CoreLibConstants; import org.codelibs.core.beans.util.BeanUtil; import org.codelibs.core.lang.StringUtil; import org.codelibs.fess.Constants; -import org.codelibs.fess.app.pager.CrawlingSessionPager; -import org.codelibs.fess.es.config.cbean.CrawlingSessionCB; -import org.codelibs.fess.es.config.exbhv.CrawlingSessionBhv; -import org.codelibs.fess.es.config.exbhv.CrawlingSessionInfoBhv; -import org.codelibs.fess.es.config.exentity.CrawlingSession; -import org.codelibs.fess.es.config.exentity.CrawlingSessionInfo; +import org.codelibs.fess.app.pager.CrawlingInfoPager; +import org.codelibs.fess.es.config.cbean.CrawlingInfoCB; +import org.codelibs.fess.es.config.exbhv.CrawlingInfoBhv; +import org.codelibs.fess.es.config.exbhv.CrawlingInfoParamBhv; +import org.codelibs.fess.es.config.exentity.CrawlingInfo; +import org.codelibs.fess.es.config.exentity.CrawlingInfoParam; import org.codelibs.fess.exception.FessSystemException; import org.codelibs.fess.util.ComponentUtil; import org.dbflute.bhv.readable.EntityRowHandler; @@ -55,92 +55,92 @@ import com.orangesignal.csv.CsvConfig; import com.orangesignal.csv.CsvReader; import com.orangesignal.csv.CsvWriter; -public class CrawlingSessionService implements Serializable { +public class CrawlingInfoService implements Serializable { private static final long serialVersionUID = 1L; - private static final Log log = LogFactory.getLog(CrawlingSessionService.class); + private static final Log log = LogFactory.getLog(CrawlingInfoService.class); @Resource - protected CrawlingSessionInfoBhv crawlingSessionInfoBhv; + protected CrawlingInfoParamBhv crawlingInfoParamBhv; @Resource - protected CrawlingSessionBhv crawlingSessionBhv; + protected CrawlingInfoBhv crawlingInfoBhv; - public CrawlingSessionService() { + public CrawlingInfoService() { super(); } - public List getCrawlingSessionList(final CrawlingSessionPager crawlingSessionPager) { + public List getCrawlingInfoList(final CrawlingInfoPager crawlingInfoPager) { - final PagingResultBean crawlingSessionList = crawlingSessionBhv.selectPage(cb -> { - cb.paging(crawlingSessionPager.getPageSize(), crawlingSessionPager.getCurrentPageNumber()); - setupListCondition(cb, crawlingSessionPager); + final PagingResultBean crawlingInfoList = crawlingInfoBhv.selectPage(cb -> { + cb.paging(crawlingInfoPager.getPageSize(), crawlingInfoPager.getCurrentPageNumber()); + setupListCondition(cb, crawlingInfoPager); }); // update pager - BeanUtil.copyBeanToBean(crawlingSessionList, crawlingSessionPager, option -> option.include(Constants.PAGER_CONVERSION_RULE)); - crawlingSessionPager.setPageNumberList(crawlingSessionList.pageRange(op -> { + BeanUtil.copyBeanToBean(crawlingInfoList, crawlingInfoPager, option -> option.include(Constants.PAGER_CONVERSION_RULE)); + crawlingInfoPager.setPageNumberList(crawlingInfoList.pageRange(op -> { op.rangeSize(5); }).createPageNumberList()); - return crawlingSessionList; + return crawlingInfoList; } - public OptionalEntity getCrawlingSession(final String id) { - return crawlingSessionBhv.selectByPK(id); + public OptionalEntity getCrawlingInfo(final String id) { + return crawlingInfoBhv.selectByPK(id); } - public void store(final CrawlingSession crawlingSession) { - setupStoreCondition(crawlingSession); + public void store(final CrawlingInfo crawlingInfo) { + setupStoreCondition(crawlingInfo); - crawlingSessionBhv.insertOrUpdate(crawlingSession, op -> { + crawlingInfoBhv.insertOrUpdate(crawlingInfo, op -> { op.setRefresh(true); }); } - public void delete(final CrawlingSession crawlingSession) { - setupDeleteCondition(crawlingSession); + public void delete(final CrawlingInfo crawlingInfo) { + setupDeleteCondition(crawlingInfo); - crawlingSessionBhv.delete(crawlingSession, op -> { + crawlingInfoBhv.delete(crawlingInfo, op -> { op.setRefresh(true); }); } - protected void setupEntityCondition(final CrawlingSessionCB cb, final Map keys) { + protected void setupEntityCondition(final CrawlingInfoCB cb, final Map keys) { } - protected void setupListCondition(final CrawlingSessionCB cb, final CrawlingSessionPager crawlingSessionPager) { - if (crawlingSessionPager.id != null) { - cb.query().docMeta().setId_Equal(crawlingSessionPager.id); + protected void setupListCondition(final CrawlingInfoCB cb, final CrawlingInfoPager crawlingInfoPager) { + if (crawlingInfoPager.id != null) { + cb.query().docMeta().setId_Equal(crawlingInfoPager.id); } // TODO Long, Integer, String supported only. - if (StringUtil.isNotBlank(crawlingSessionPager.sessionId)) { - cb.query().setSessionId_Match(crawlingSessionPager.sessionId); + if (StringUtil.isNotBlank(crawlingInfoPager.sessionId)) { + cb.query().setSessionId_Match(crawlingInfoPager.sessionId); } cb.query().addOrderBy_CreatedTime_Desc(); } - protected void setupStoreCondition(final CrawlingSession crawlingSession) { - if (crawlingSession == null) { + protected void setupStoreCondition(final CrawlingInfo crawlingInfo) { + if (crawlingInfo == null) { throw new FessSystemException("Crawling Session is null."); } final long now = ComponentUtil.getSystemHelper().getCurrentTimeAsLong(); - if (crawlingSession.getCreatedTime() == null) { - crawlingSession.setCreatedTime(now); + if (crawlingInfo.getCreatedTime() == null) { + crawlingInfo.setCreatedTime(now); } } - protected void setupDeleteCondition(final CrawlingSession crawlingSession) { - crawlingSessionInfoBhv.queryDelete(cb -> { - cb.query().setCrawlingSessionId_Equal(crawlingSession.getId()); + protected void setupDeleteCondition(final CrawlingInfo crawlingInfo) { + crawlingInfoParamBhv.queryDelete(cb -> { + cb.query().setCrawlingInfoId_Equal(crawlingInfo.getId()); }); } public void deleteSessionIdsBefore(final String activeSessionId, final String name, final long date) { - final List crawlingSessionList = crawlingSessionBhv.selectList(cb -> { + final List crawlingInfoList = crawlingInfoBhv.selectList(cb -> { cb.query().filtered((cq, cf) -> { cq.setExpiredTime_LessEqual(date); if (StringUtil.isNotBlank(name)) { @@ -154,75 +154,75 @@ public class CrawlingSessionService implements Serializable { cb.specify().columnId(); }); - if (!crawlingSessionList.isEmpty()) { - final List crawlingSessionIdList = new ArrayList<>(); - for (final CrawlingSession cs : crawlingSessionList) { - crawlingSessionIdList.add(cs.getId()); + if (!crawlingInfoList.isEmpty()) { + final List crawlingInfoIdList = new ArrayList<>(); + for (final CrawlingInfo cs : crawlingInfoList) { + crawlingInfoIdList.add(cs.getId()); } - crawlingSessionInfoBhv.queryDelete(cb2 -> { - cb2.query().setCrawlingSessionId_InScope(crawlingSessionIdList); + crawlingInfoParamBhv.queryDelete(cb2 -> { + cb2.query().setCrawlingInfoId_InScope(crawlingInfoIdList); }); - crawlingSessionBhv.batchDelete(crawlingSessionList); + crawlingInfoBhv.batchDelete(crawlingInfoList); } } - public CrawlingSession get(final String sessionId) { - return crawlingSessionBhv.selectEntity(cb -> { + public CrawlingInfo get(final String sessionId) { + return crawlingInfoBhv.selectEntity(cb -> { cb.query().setSessionId_Equal(sessionId); }).orElse(null);//TODO } - public void storeInfo(final List crawlingSessionInfoList) { - if (crawlingSessionInfoList == null) { + public void storeInfo(final List crawlingInfoParamList) { + if (crawlingInfoParamList == null) { throw new FessSystemException("Crawling Session Info is null."); } final long now = ComponentUtil.getSystemHelper().getCurrentTimeAsLong(); - for (final CrawlingSessionInfo crawlingSessionInfo : crawlingSessionInfoList) { - if (crawlingSessionInfo.getCreatedTime() == null) { - crawlingSessionInfo.setCreatedTime(now); + for (final CrawlingInfoParam crawlingInfoParam : crawlingInfoParamList) { + if (crawlingInfoParam.getCreatedTime() == null) { + crawlingInfoParam.setCreatedTime(now); } } - crawlingSessionInfoBhv.batchInsert(crawlingSessionInfoList); + crawlingInfoParamBhv.batchInsert(crawlingInfoParamList); } - public List getCrawlingSessionInfoList(final String id) { - return crawlingSessionInfoBhv.selectList(cb -> { - cb.query().setCrawlingSessionId_Equal(id); + public List getCrawlingInfoParamList(final String id) { + return crawlingInfoParamBhv.selectList(cb -> { + cb.query().setCrawlingInfoId_Equal(id); cb.query().addOrderBy_Id_Asc(); }); } - public List getLastCrawlingSessionInfoList(final String sessionId) { - final CrawlingSession crawlingSession = getLast(sessionId); - if (crawlingSession == null) { + public List getLastCrawlingInfoParamList(final String sessionId) { + final CrawlingInfo crawlingInfo = getLast(sessionId); + if (crawlingInfo == null) { return Collections.emptyList(); } - return crawlingSessionInfoBhv.selectList(cb -> { - cb.query().setCrawlingSessionId_Equal(crawlingSession.getId()); + return crawlingInfoParamBhv.selectList(cb -> { + cb.query().setCrawlingInfoId_Equal(crawlingInfo.getId()); cb.query().addOrderBy_Id_Asc(); }); } public void deleteOldSessions(final Set activeSessionId) { - final List activeSessionList = - activeSessionId.isEmpty() ? Collections.emptyList() : crawlingSessionBhv.selectList(cb -> { + final List activeSessionList = + activeSessionId.isEmpty() ? Collections.emptyList() : crawlingInfoBhv.selectList(cb -> { cb.query().setSessionId_InScope(activeSessionId); cb.specify().columnId(); }); final List idList = activeSessionList.stream().map(session -> session.getId()).collect(Collectors.toList()); if (!idList.isEmpty()) { - crawlingSessionInfoBhv.queryDelete(cb1 -> { + crawlingInfoParamBhv.queryDelete(cb1 -> { cb1.query().filtered((cq, cf) -> { cq.matchAll(); cf.not(subCf -> { - subCf.setCrawlingSessionId_InScope(idList); + subCf.setCrawlingInfoId_InScope(idList); }); }); }); - crawlingSessionBhv.queryDelete(cb2 -> { + crawlingInfoBhv.queryDelete(cb2 -> { cb2.query().filtered((cq, cf) -> { cq.matchAll(); cf.not(subCf -> { @@ -243,23 +243,23 @@ public class CrawlingSessionService implements Serializable { while ((list = csvReader.readValues()) != null) { try { final String sessionId = list.get(0); - CrawlingSession crawlingSession = crawlingSessionBhv.selectEntity(cb -> { + CrawlingInfo crawlingInfo = crawlingInfoBhv.selectEntity(cb -> { cb.query().setSessionId_Equal(sessionId); cb.specify().columnSessionId(); }).orElse(null);//TODO - if (crawlingSession == null) { - crawlingSession = new CrawlingSession(); - crawlingSession.setSessionId(list.get(0)); - crawlingSession.setCreatedTime(formatter.parse(list.get(1)).getTime()); - crawlingSessionBhv.insert(crawlingSession); + if (crawlingInfo == null) { + crawlingInfo = new CrawlingInfo(); + crawlingInfo.setSessionId(list.get(0)); + crawlingInfo.setCreatedTime(formatter.parse(list.get(1)).getTime()); + crawlingInfoBhv.insert(crawlingInfo); } - final CrawlingSessionInfo entity = new CrawlingSessionInfo(); - entity.setCrawlingSessionId(crawlingSession.getId()); + final CrawlingInfoParam entity = new CrawlingInfoParam(); + entity.setCrawlingInfoId(crawlingInfo.getId()); entity.setKey(list.get(2)); entity.setValue(list.get(3)); entity.setCreatedTime(formatter.parse(list.get(4)).getTime()); - crawlingSessionInfoBhv.insert(entity); + crawlingInfoParamBhv.insert(entity); } catch (final Exception e) { log.warn("Failed to read a click log: " + list, e); } @@ -284,18 +284,18 @@ public class CrawlingSessionService implements Serializable { list.add("CreatedTime"); csvWriter.writeValues(list); final DateTimeFormatter formatter = DateTimeFormatter.ofPattern(CoreLibConstants.DATE_FORMAT_ISO_8601_EXTEND); - crawlingSessionInfoBhv.selectCursor(cb -> { + crawlingInfoParamBhv.selectCursor(cb -> { cb.query().matchAll(); - }, new EntityRowHandler() { + }, new EntityRowHandler() { @Override - public void handle(final CrawlingSessionInfo entity) { + public void handle(final CrawlingInfoParam entity) { final List list = new ArrayList(); - entity.getCrawlingSession().ifPresent(crawlingSession -> { - addToList(list, crawlingSession.getSessionId()); - addToList(list, crawlingSession.getCreatedTime()); + entity.getCrawlingInfo().ifPresent(crawlingInfo -> { + addToList(list, crawlingInfo.getSessionId()); + addToList(list, crawlingInfo.getCreatedTime()); }); // TODO - if (!entity.getCrawlingSession().isPresent()) { + if (!entity.getCrawlingInfo().isPresent()) { addToList(list, ""); addToList(list, ""); } @@ -326,21 +326,21 @@ public class CrawlingSessionService implements Serializable { } public void deleteBefore(final long date) { - crawlingSessionBhv.selectBulk(cb -> { + crawlingInfoBhv.selectBulk(cb -> { cb.query().setExpiredTime_LessThan(date); }, list -> { final List idList = list.stream().map(entity -> entity.getId()).collect(Collectors.toList()); - crawlingSessionInfoBhv.queryDelete(cb1 -> { - cb1.query().setCrawlingSessionId_InScope(idList); + crawlingInfoParamBhv.queryDelete(cb1 -> { + cb1.query().setCrawlingInfoId_InScope(idList); }); - crawlingSessionBhv.queryDelete(cb2 -> { + crawlingInfoBhv.queryDelete(cb2 -> { cb2.query().setExpiredTime_LessThan(date); }); }); } - public CrawlingSession getLast(final String sessionId) { - final ListResultBean list = crawlingSessionBhv.selectList(cb -> { + public CrawlingInfo getLast(final String sessionId) { + final ListResultBean list = crawlingInfoBhv.selectList(cb -> { cb.query().setSessionId_Equal(sessionId); cb.query().addOrderBy_CreatedTime_Desc(); cb.fetchFirst(1); diff --git a/src/main/java/org/codelibs/fess/app/service/FileAuthenticationService.java b/src/main/java/org/codelibs/fess/app/service/FileAuthenticationService.java index e1b03d52e..c903adbcf 100644 --- a/src/main/java/org/codelibs/fess/app/service/FileAuthenticationService.java +++ b/src/main/java/org/codelibs/fess/app/service/FileAuthenticationService.java @@ -23,7 +23,7 @@ import javax.annotation.Resource; import org.codelibs.core.beans.util.BeanUtil; import org.codelibs.fess.Constants; -import org.codelibs.fess.app.pager.FileAuthenticationPager; +import org.codelibs.fess.app.pager.FileAuthPager; import org.codelibs.fess.es.config.cbean.FileAuthenticationCB; import org.codelibs.fess.es.config.exbhv.FileAuthenticationBhv; import org.codelibs.fess.es.config.exentity.FileAuthentication; @@ -41,7 +41,7 @@ public class FileAuthenticationService implements Serializable { super(); } - public List getFileAuthenticationList(final FileAuthenticationPager fileAuthenticationPager) { + public List getFileAuthenticationList(final FileAuthPager fileAuthenticationPager) { final PagingResultBean fileAuthenticationList = fileAuthenticationBhv.selectPage(cb -> { cb.paging(fileAuthenticationPager.getPageSize(), fileAuthenticationPager.getCurrentPageNumber()); @@ -79,7 +79,7 @@ public class FileAuthenticationService implements Serializable { } - protected void setupListCondition(final FileAuthenticationCB cb, final FileAuthenticationPager fileAuthenticationPager) { + protected void setupListCondition(final FileAuthenticationCB cb, final FileAuthPager fileAuthenticationPager) { if (fileAuthenticationPager.id != null) { cb.query().docMeta().setId_Equal(fileAuthenticationPager.id); } diff --git a/src/main/java/org/codelibs/fess/app/service/PathMappingService.java b/src/main/java/org/codelibs/fess/app/service/PathMappingService.java index d1d37a9b3..ce01a54d1 100644 --- a/src/main/java/org/codelibs/fess/app/service/PathMappingService.java +++ b/src/main/java/org/codelibs/fess/app/service/PathMappingService.java @@ -24,7 +24,7 @@ import javax.annotation.Resource; import org.codelibs.core.beans.util.BeanUtil; import org.codelibs.fess.Constants; -import org.codelibs.fess.app.pager.PathMappingPager; +import org.codelibs.fess.app.pager.PathMapPager; import org.codelibs.fess.es.config.cbean.PathMappingCB; import org.codelibs.fess.es.config.exbhv.PathMappingBhv; import org.codelibs.fess.es.config.exentity.PathMapping; @@ -38,7 +38,7 @@ public class PathMappingService implements Serializable { @Resource protected PathMappingBhv pathMappingBhv; - public List getPathMappingList(final PathMappingPager pathMappingPager) { + public List getPathMappingList(final PathMapPager pathMappingPager) { final PagingResultBean pathMappingList = pathMappingBhv.selectPage(cb -> { cb.paging(pathMappingPager.getPageSize(), pathMappingPager.getCurrentPageNumber()); @@ -84,7 +84,7 @@ public class PathMappingService implements Serializable { }); } - protected void setupListCondition(final PathMappingCB cb, final PathMappingPager pathMappingPager) { + protected void setupListCondition(final PathMappingCB cb, final PathMapPager pathMappingPager) { if (pathMappingPager.id != null) { cb.query().docMeta().setId_Equal(pathMappingPager.id); } diff --git a/src/main/java/org/codelibs/fess/app/service/RequestHeaderService.java b/src/main/java/org/codelibs/fess/app/service/RequestHeaderService.java index 3486c366c..513729456 100644 --- a/src/main/java/org/codelibs/fess/app/service/RequestHeaderService.java +++ b/src/main/java/org/codelibs/fess/app/service/RequestHeaderService.java @@ -23,7 +23,7 @@ import javax.annotation.Resource; import org.codelibs.core.beans.util.BeanUtil; import org.codelibs.fess.Constants; -import org.codelibs.fess.app.pager.RequestHeaderPager; +import org.codelibs.fess.app.pager.ReqHeaderPager; import org.codelibs.fess.es.config.cbean.RequestHeaderCB; import org.codelibs.fess.es.config.exbhv.RequestHeaderBhv; import org.codelibs.fess.es.config.exentity.RequestHeader; @@ -41,7 +41,7 @@ public class RequestHeaderService implements Serializable { super(); } - public List getRequestHeaderList(final RequestHeaderPager requestHeaderPager) { + public List getRequestHeaderList(final ReqHeaderPager requestHeaderPager) { final PagingResultBean requestHeaderList = requestHeaderBhv.selectPage(cb -> { cb.paging(requestHeaderPager.getPageSize(), requestHeaderPager.getCurrentPageNumber()); @@ -79,7 +79,7 @@ public class RequestHeaderService implements Serializable { } - protected void setupListCondition(final RequestHeaderCB cb, final RequestHeaderPager requestHeaderPager) { + protected void setupListCondition(final RequestHeaderCB cb, final ReqHeaderPager requestHeaderPager) { if (requestHeaderPager.id != null) { cb.query().docMeta().setId_Equal(requestHeaderPager.id); } 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 cff46b194..26e2f3b0a 100644 --- a/src/main/java/org/codelibs/fess/app/service/ScheduledJobService.java +++ b/src/main/java/org/codelibs/fess/app/service/ScheduledJobService.java @@ -23,7 +23,7 @@ import javax.annotation.Resource; import org.codelibs.core.beans.util.BeanUtil; import org.codelibs.fess.Constants; -import org.codelibs.fess.app.pager.ScheduledJobPager; +import org.codelibs.fess.app.pager.SchedulerPager; import org.codelibs.fess.es.config.cbean.ScheduledJobCB; import org.codelibs.fess.es.config.exbhv.ScheduledJobBhv; import org.codelibs.fess.es.config.exentity.ScheduledJob; @@ -42,7 +42,7 @@ public class ScheduledJobService implements Serializable { super(); } - public List getScheduledJobList(final ScheduledJobPager scheduledJobPager) { + public List getScheduledJobList(final SchedulerPager scheduledJobPager) { final PagingResultBean scheduledJobList = scheduledJobBhv.selectPage(cb -> { cb.paging(scheduledJobPager.getPageSize(), scheduledJobPager.getCurrentPageNumber()); @@ -74,7 +74,7 @@ public class ScheduledJobService implements Serializable { @Resource protected JobScheduler jobScheduler; - protected void setupListCondition(final ScheduledJobCB cb, final ScheduledJobPager scheduledJobPager) { + protected void setupListCondition(final ScheduledJobCB cb, final SchedulerPager scheduledJobPager) { if (scheduledJobPager.id != null) { cb.query().docMeta().setId_Equal(scheduledJobPager.id); } diff --git a/src/main/java/org/codelibs/fess/app/service/WebAuthenticationService.java b/src/main/java/org/codelibs/fess/app/service/WebAuthenticationService.java index 8e3e65b08..0205eb34a 100644 --- a/src/main/java/org/codelibs/fess/app/service/WebAuthenticationService.java +++ b/src/main/java/org/codelibs/fess/app/service/WebAuthenticationService.java @@ -23,7 +23,7 @@ import javax.annotation.Resource; import org.codelibs.core.beans.util.BeanUtil; import org.codelibs.fess.Constants; -import org.codelibs.fess.app.pager.WebAuthenticationPager; +import org.codelibs.fess.app.pager.WebAuthPager; import org.codelibs.fess.es.config.cbean.WebAuthenticationCB; import org.codelibs.fess.es.config.exbhv.WebAuthenticationBhv; import org.codelibs.fess.es.config.exentity.WebAuthentication; @@ -41,7 +41,7 @@ public class WebAuthenticationService implements Serializable { super(); } - public List getWebAuthenticationList(final WebAuthenticationPager webAuthenticationPager) { + public List getWebAuthenticationList(final WebAuthPager webAuthenticationPager) { final PagingResultBean webAuthenticationList = webAuthenticationBhv.selectPage(cb -> { cb.paging(webAuthenticationPager.getPageSize(), webAuthenticationPager.getCurrentPageNumber()); @@ -79,7 +79,7 @@ public class WebAuthenticationService implements Serializable { } - protected void setupListCondition(final WebAuthenticationCB cb, final WebAuthenticationPager webAuthenticationPager) { + protected void setupListCondition(final WebAuthenticationCB cb, final WebAuthPager webAuthenticationPager) { if (webAuthenticationPager.id != null) { cb.query().docMeta().setId_Equal(webAuthenticationPager.id); } diff --git a/src/main/java/org/codelibs/fess/app/web/admin/boostdoc/AdminBoostdocAction.java b/src/main/java/org/codelibs/fess/app/web/admin/boostdoc/AdminBoostdocAction.java index 86ed870eb..e9d0d53ce 100644 --- a/src/main/java/org/codelibs/fess/app/web/admin/boostdoc/AdminBoostdocAction.java +++ b/src/main/java/org/codelibs/fess/app/web/admin/boostdoc/AdminBoostdocAction.java @@ -18,7 +18,7 @@ package org.codelibs.fess.app.web.admin.boostdoc; import javax.annotation.Resource; import org.codelibs.fess.Constants; -import org.codelibs.fess.app.pager.BoostDocumentRulePager; +import org.codelibs.fess.app.pager.BoostDocPager; import org.codelibs.fess.app.service.BoostDocumentRuleService; import org.codelibs.fess.app.web.CrudMode; import org.codelibs.fess.app.web.base.FessAdminAction; @@ -42,7 +42,7 @@ public class AdminBoostdocAction extends FessAdminAction { @Resource private BoostDocumentRuleService boostDocumentRuleService; @Resource - private BoostDocumentRulePager boostDocumentRulePager; + private BoostDocPager boostDocPager; @Resource private SystemHelper systemHelper; @@ -66,9 +66,9 @@ public class AdminBoostdocAction extends FessAdminAction { @Execute public HtmlResponse list(final OptionalThing pageNumber, final SearchForm form) { pageNumber.ifPresent(num -> { - boostDocumentRulePager.setCurrentPageNumber(pageNumber.get()); + boostDocPager.setCurrentPageNumber(pageNumber.get()); }).orElse(() -> { - boostDocumentRulePager.setCurrentPageNumber(0); + boostDocPager.setCurrentPageNumber(0); }); return asHtml(path_AdminBoostdoc_AdminBoostdocJsp).renderWith(data -> { searchPaging(data, form); @@ -77,7 +77,7 @@ public class AdminBoostdocAction extends FessAdminAction { @Execute public HtmlResponse search(final SearchForm form) { - copyBeanToBean(form, boostDocumentRulePager, op -> op.exclude(Constants.PAGER_CONVERSION_RULE)); + copyBeanToBean(form, boostDocPager, op -> op.exclude(Constants.PAGER_CONVERSION_RULE)); return asHtml(path_AdminBoostdoc_AdminBoostdocJsp).renderWith(data -> { searchPaging(data, form); }); @@ -85,17 +85,17 @@ public class AdminBoostdocAction extends FessAdminAction { @Execute public HtmlResponse reset(final SearchForm form) { - boostDocumentRulePager.clear(); + boostDocPager.clear(); return asHtml(path_AdminBoostdoc_AdminBoostdocJsp).renderWith(data -> { searchPaging(data, form); }); } protected void searchPaging(final RenderData data, final SearchForm form) { - data.register("boostDocumentRuleItems", boostDocumentRuleService.getBoostDocumentRuleList(boostDocumentRulePager)); // page navi + data.register("boostDocumentRuleItems", boostDocumentRuleService.getBoostDocumentRuleList(boostDocPager)); // page navi // restore from pager - copyBeanToBean(boostDocumentRulePager, form, op -> op.include("id")); + copyBeanToBean(boostDocPager, form, op -> op.include("id")); } // =================================================================================== @@ -256,10 +256,10 @@ public class AdminBoostdocAction extends FessAdminAction { private HtmlResponse asListHtml() { return asHtml(path_AdminBoostdoc_AdminBoostdocJsp).renderWith(data -> { - data.register("boostDocumentRuleItems", boostDocumentRuleService.getBoostDocumentRuleList(boostDocumentRulePager)); + data.register("boostDocumentRuleItems", boostDocumentRuleService.getBoostDocumentRuleList(boostDocPager)); }).useForm(SearchForm.class, setup -> { setup.setup(form -> { - copyBeanToBean(boostDocumentRulePager, form, op -> op.include("id")); + copyBeanToBean(boostDocPager, form, op -> op.include("id")); }); }); } diff --git a/src/main/java/org/codelibs/fess/app/web/admin/crawlinginfo/AdminCrawlinginfoAction.java b/src/main/java/org/codelibs/fess/app/web/admin/crawlinginfo/AdminCrawlinginfoAction.java index 215ace684..9c1a9bf78 100644 --- a/src/main/java/org/codelibs/fess/app/web/admin/crawlinginfo/AdminCrawlinginfoAction.java +++ b/src/main/java/org/codelibs/fess/app/web/admin/crawlinginfo/AdminCrawlinginfoAction.java @@ -18,8 +18,8 @@ package org.codelibs.fess.app.web.admin.crawlinginfo; import javax.annotation.Resource; import org.codelibs.fess.Constants; -import org.codelibs.fess.app.pager.CrawlingSessionPager; -import org.codelibs.fess.app.service.CrawlingSessionService; +import org.codelibs.fess.app.pager.CrawlingInfoPager; +import org.codelibs.fess.app.service.CrawlingInfoService; import org.codelibs.fess.app.web.CrudMode; import org.codelibs.fess.app.web.base.FessAdminAction; import org.codelibs.fess.helper.JobHelper; @@ -39,9 +39,9 @@ public class AdminCrawlinginfoAction extends FessAdminAction { // Attribute // ========= @Resource - private CrawlingSessionService crawlingSessionService; + private CrawlingInfoService crawlingInfoService; @Resource - private CrawlingSessionPager crawlingSessionPager; + private CrawlingInfoPager crawlingInfoPager; @Resource private SystemHelper systemHelper; @Resource @@ -68,7 +68,7 @@ public class AdminCrawlinginfoAction extends FessAdminAction { @Execute public HtmlResponse list(final Integer pageNumber, final SearchForm form) { saveToken(); - crawlingSessionPager.setCurrentPageNumber(pageNumber); + crawlingInfoPager.setCurrentPageNumber(pageNumber); return asHtml(path_AdminCrawlinginfo_AdminCrawlinginfoJsp).renderWith(data -> { searchPaging(data, form); }); @@ -77,7 +77,7 @@ public class AdminCrawlinginfoAction extends FessAdminAction { @Execute public HtmlResponse search(final SearchForm form) { saveToken(); - copyBeanToBean(form, crawlingSessionPager, op -> op.exclude(Constants.PAGER_CONVERSION_RULE)); + copyBeanToBean(form, crawlingInfoPager, op -> op.exclude(Constants.PAGER_CONVERSION_RULE)); return asHtml(path_AdminCrawlinginfo_AdminCrawlinginfoJsp).renderWith(data -> { searchPaging(data, form); }); @@ -86,7 +86,7 @@ public class AdminCrawlinginfoAction extends FessAdminAction { @Execute public HtmlResponse reset(final SearchForm form) { saveToken(); - crawlingSessionPager.clear(); + crawlingInfoPager.clear(); return asHtml(path_AdminCrawlinginfo_AdminCrawlinginfoJsp).renderWith(data -> { searchPaging(data, form); }); @@ -101,10 +101,10 @@ public class AdminCrawlinginfoAction extends FessAdminAction { } protected void searchPaging(final RenderData data, final SearchForm form) { - data.register("crawlingSessionItems", crawlingSessionService.getCrawlingSessionList(crawlingSessionPager)); // page navi + data.register("crawlingInfoItems", crawlingInfoService.getCrawlingInfoList(crawlingInfoPager)); // page navi // restore from pager - copyBeanToBean(crawlingSessionPager, form, op -> op.include("sessionId")); + copyBeanToBean(crawlingInfoPager, form, op -> op.include("sessionId")); } // =================================================================================== @@ -120,7 +120,7 @@ public class AdminCrawlinginfoAction extends FessAdminAction { saveToken(); return asHtml(path_AdminCrawlinginfo_AdminCrawlinginfoDetailsJsp).useForm(EditForm.class, op -> { op.setup(form -> { - crawlingSessionService.getCrawlingSession(id).ifPresent(entity -> { + crawlingInfoService.getCrawlingInfo(id).ifPresent(entity -> { copyBeanToBean(entity, form, copyOp -> { copyOp.excludeNull(); }); @@ -130,7 +130,7 @@ public class AdminCrawlinginfoAction extends FessAdminAction { }); }); }).renderWith(data -> { - data.register("crawlingSessionInfoItems", crawlingSessionService.getCrawlingSessionInfoList(id)); + data.register("crawlingInfoParamItems", crawlingInfoService.getCrawlingInfoParamList(id)); }); } @@ -143,8 +143,8 @@ public class AdminCrawlinginfoAction extends FessAdminAction { validate(form, messages -> {}, () -> asDetailsHtml()); verifyToken(() -> asDetailsHtml()); final String id = form.id; - crawlingSessionService.getCrawlingSession(id).alwaysPresent(entity -> { - crawlingSessionService.delete(entity); + crawlingInfoService.getCrawlingInfo(id).alwaysPresent(entity -> { + crawlingInfoService.delete(entity); saveInfo(messages -> messages.addSuccessCrudDeleteCrudTable(GLOBAL)); }); return redirect(getClass()); @@ -153,9 +153,9 @@ public class AdminCrawlinginfoAction extends FessAdminAction { @Execute public HtmlResponse deleteall() { verifyToken(() -> asListHtml()); - crawlingSessionService.deleteOldSessions(jobHelper.getRunningSessionIdSet()); - crawlingSessionPager.clear(); - saveInfo(messages -> messages.addSuccessCrawlingSessionDeleteAll(GLOBAL)); + crawlingInfoService.deleteOldSessions(jobHelper.getRunningSessionIdSet()); + crawlingInfoPager.clear(); + saveInfo(messages -> messages.addSuccessCrawlingInfoDeleteAll(GLOBAL)); return redirect(getClass()); } @@ -180,10 +180,10 @@ public class AdminCrawlinginfoAction extends FessAdminAction { private HtmlResponse asListHtml() { return asHtml(path_AdminCrawlinginfo_AdminCrawlinginfoJsp).renderWith(data -> { - data.register("crawlingSessionItems", crawlingSessionService.getCrawlingSessionList(crawlingSessionPager)); // page navi + data.register("crawlingInfoItems", crawlingInfoService.getCrawlingInfoList(crawlingInfoPager)); // page navi }).useForm(SearchForm.class, setup -> { setup.setup(form -> { - copyBeanToBean(crawlingSessionPager, form, op -> op.include("id")); + copyBeanToBean(crawlingInfoPager, form, op -> op.include("id")); }); }); } diff --git a/src/main/java/org/codelibs/fess/app/web/admin/fileauth/AdminFileauthAction.java b/src/main/java/org/codelibs/fess/app/web/admin/fileauth/AdminFileauthAction.java index e414ff6bd..4cb75a1b1 100644 --- a/src/main/java/org/codelibs/fess/app/web/admin/fileauth/AdminFileauthAction.java +++ b/src/main/java/org/codelibs/fess/app/web/admin/fileauth/AdminFileauthAction.java @@ -24,7 +24,7 @@ import java.util.Map; import javax.annotation.Resource; import org.codelibs.fess.Constants; -import org.codelibs.fess.app.pager.FileAuthenticationPager; +import org.codelibs.fess.app.pager.FileAuthPager; import org.codelibs.fess.app.service.FileAuthenticationService; import org.codelibs.fess.app.service.FileConfigService; import org.codelibs.fess.app.web.CrudMode; @@ -54,7 +54,7 @@ public class AdminFileauthAction extends FessAdminAction { @Resource private FileAuthenticationService fileAuthenticationService; @Resource - private FileAuthenticationPager fileAuthenticationPager; + private FileAuthPager fileAuthenticationPager; @Resource private SystemHelper systemHelper; diff --git a/src/main/java/org/codelibs/fess/app/web/admin/pathmap/AdminPathmapAction.java b/src/main/java/org/codelibs/fess/app/web/admin/pathmap/AdminPathmapAction.java index 959db3169..e6ef1aeaa 100644 --- a/src/main/java/org/codelibs/fess/app/web/admin/pathmap/AdminPathmapAction.java +++ b/src/main/java/org/codelibs/fess/app/web/admin/pathmap/AdminPathmapAction.java @@ -18,7 +18,7 @@ package org.codelibs.fess.app.web.admin.pathmap; import javax.annotation.Resource; import org.codelibs.fess.Constants; -import org.codelibs.fess.app.pager.PathMappingPager; +import org.codelibs.fess.app.pager.PathMapPager; import org.codelibs.fess.app.service.PathMappingService; import org.codelibs.fess.app.web.CrudMode; import org.codelibs.fess.app.web.admin.boostdoc.SearchForm; @@ -45,7 +45,7 @@ public class AdminPathmapAction extends FessAdminAction { @Resource private PathMappingService pathMappingService; @Resource - private PathMappingPager pathMappingPager; + private PathMapPager pathMapPager; @Resource private SystemHelper systemHelper; @@ -69,9 +69,9 @@ public class AdminPathmapAction extends FessAdminAction { @Execute public HtmlResponse list(final OptionalThing pageNumber, final SearchForm form) { pageNumber.ifPresent(num -> { - pathMappingPager.setCurrentPageNumber(pageNumber.get()); + pathMapPager.setCurrentPageNumber(pageNumber.get()); }).orElse(() -> { - pathMappingPager.setCurrentPageNumber(0); + pathMapPager.setCurrentPageNumber(0); }); return asHtml(path_AdminPathmap_AdminPathmapJsp).renderWith(data -> { searchPaging(data, form); @@ -80,7 +80,7 @@ public class AdminPathmapAction extends FessAdminAction { @Execute public HtmlResponse search(final SearchForm form) { - copyBeanToBean(form, pathMappingPager, op -> op.exclude(Constants.PAGER_CONVERSION_RULE)); + copyBeanToBean(form, pathMapPager, op -> op.exclude(Constants.PAGER_CONVERSION_RULE)); return asHtml(path_AdminPathmap_AdminPathmapJsp).renderWith(data -> { searchPaging(data, form); }); @@ -88,17 +88,17 @@ public class AdminPathmapAction extends FessAdminAction { @Execute public HtmlResponse reset(final SearchForm form) { - pathMappingPager.clear(); + pathMapPager.clear(); return asHtml(path_AdminPathmap_AdminPathmapJsp).renderWith(data -> { searchPaging(data, form); }); } protected void searchPaging(final RenderData data, final SearchForm form) { - data.register("pathMappingItems", pathMappingService.getPathMappingList(pathMappingPager)); // page navi + data.register("pathMappingItems", pathMappingService.getPathMappingList(pathMapPager)); // page navi // restore from pager - copyBeanToBean(pathMappingPager, form, op -> op.include("id")); + copyBeanToBean(pathMapPager, form, op -> op.include("id")); } // =================================================================================== @@ -258,10 +258,10 @@ public class AdminPathmapAction extends FessAdminAction { private HtmlResponse asListHtml() { return asHtml(path_AdminPathmap_AdminPathmapJsp).renderWith(data -> { - data.register("pathMappingItems", pathMappingService.getPathMappingList(pathMappingPager)); // page navi + data.register("pathMappingItems", pathMappingService.getPathMappingList(pathMapPager)); // page navi }).useForm(SearchForm.class, setup -> { setup.setup(form -> { - copyBeanToBean(pathMappingPager, form, op -> op.include("id")); + copyBeanToBean(pathMapPager, form, op -> op.include("id")); }); }); } diff --git a/src/main/java/org/codelibs/fess/app/web/admin/reqheader/AdminReqheaderAction.java b/src/main/java/org/codelibs/fess/app/web/admin/reqheader/AdminReqheaderAction.java index 65a470246..1e134839d 100644 --- a/src/main/java/org/codelibs/fess/app/web/admin/reqheader/AdminReqheaderAction.java +++ b/src/main/java/org/codelibs/fess/app/web/admin/reqheader/AdminReqheaderAction.java @@ -24,7 +24,7 @@ import java.util.Map; import javax.annotation.Resource; import org.codelibs.fess.Constants; -import org.codelibs.fess.app.pager.RequestHeaderPager; +import org.codelibs.fess.app.pager.ReqHeaderPager; import org.codelibs.fess.app.service.RequestHeaderService; import org.codelibs.fess.app.service.WebConfigService; import org.codelibs.fess.app.web.CrudMode; @@ -55,7 +55,7 @@ public class AdminReqheaderAction extends FessAdminAction { @Resource private RequestHeaderService requestHeaderService; @Resource - private RequestHeaderPager requestHeaderPager; + private ReqHeaderPager reqHeaderPager; @Resource protected WebConfigService webConfigService; @Resource @@ -81,9 +81,9 @@ public class AdminReqheaderAction extends FessAdminAction { @Execute public HtmlResponse list(final OptionalThing pageNumber, final SearchForm form) { pageNumber.ifPresent(num -> { - requestHeaderPager.setCurrentPageNumber(pageNumber.get()); + reqHeaderPager.setCurrentPageNumber(pageNumber.get()); }).orElse(() -> { - requestHeaderPager.setCurrentPageNumber(0); + reqHeaderPager.setCurrentPageNumber(0); }); return asHtml(path_AdminReqheader_AdminReqheaderJsp).renderWith(data -> { searchPaging(data, form); @@ -92,7 +92,7 @@ public class AdminReqheaderAction extends FessAdminAction { @Execute public HtmlResponse search(final SearchForm form) { - copyBeanToBean(form, requestHeaderPager, op -> op.exclude(Constants.PAGER_CONVERSION_RULE)); + copyBeanToBean(form, reqHeaderPager, op -> op.exclude(Constants.PAGER_CONVERSION_RULE)); return asHtml(path_AdminReqheader_AdminReqheaderJsp).renderWith(data -> { searchPaging(data, form); }); @@ -100,18 +100,18 @@ public class AdminReqheaderAction extends FessAdminAction { @Execute public HtmlResponse reset(final SearchForm form) { - requestHeaderPager.clear(); + reqHeaderPager.clear(); return asHtml(path_AdminReqheader_AdminReqheaderJsp).renderWith(data -> { searchPaging(data, form); }); } protected void searchPaging(final RenderData data, final SearchForm form) { - data.register("requestHeaderItems", requestHeaderService.getRequestHeaderList(requestHeaderPager)); // page navi + data.register("requestHeaderItems", requestHeaderService.getRequestHeaderList(reqHeaderPager)); // page navi data.register("displayCreateLink", !webConfigService.getAllWebConfigList(false, false, false, null).isEmpty()); // restore from pager - copyBeanToBean(requestHeaderPager, form, op -> op.include("id")); + copyBeanToBean(reqHeaderPager, form, op -> op.include("id")); } // =================================================================================== @@ -299,11 +299,11 @@ public class AdminReqheaderAction extends FessAdminAction { private HtmlResponse asListHtml() { return asHtml(path_AdminReqheader_AdminReqheaderJsp).renderWith(data -> { - data.register("requestHeaderItems", requestHeaderService.getRequestHeaderList(requestHeaderPager)); // page navi + data.register("requestHeaderItems", requestHeaderService.getRequestHeaderList(reqHeaderPager)); // page navi data.register("displayCreateLink", !webConfigService.getAllWebConfigList(false, false, false, null).isEmpty()); }).useForm(SearchForm.class, setup -> { setup.setup(form -> { - copyBeanToBean(requestHeaderPager, form, op -> op.include("id")); + copyBeanToBean(reqHeaderPager, form, op -> op.include("id")); }); }); } diff --git a/src/main/java/org/codelibs/fess/app/web/admin/scheduler/AdminSchedulerAction.java b/src/main/java/org/codelibs/fess/app/web/admin/scheduler/AdminSchedulerAction.java index d036d07e3..f09dd6cd2 100644 --- a/src/main/java/org/codelibs/fess/app/web/admin/scheduler/AdminSchedulerAction.java +++ b/src/main/java/org/codelibs/fess/app/web/admin/scheduler/AdminSchedulerAction.java @@ -18,7 +18,7 @@ package org.codelibs.fess.app.web.admin.scheduler; import javax.annotation.Resource; import org.codelibs.fess.Constants; -import org.codelibs.fess.app.pager.ScheduledJobPager; +import org.codelibs.fess.app.pager.SchedulerPager; import org.codelibs.fess.app.service.ScheduledJobService; import org.codelibs.fess.app.web.CrudMode; import org.codelibs.fess.app.web.admin.boostdoc.SearchForm; @@ -48,7 +48,7 @@ public class AdminSchedulerAction extends FessAdminAction { @Resource private ScheduledJobService scheduledJobService; @Resource - private ScheduledJobPager scheduledJobPager; + private SchedulerPager scheduledJobPager; @Resource private SystemHelper systemHelper; @Resource diff --git a/src/main/java/org/codelibs/fess/app/web/admin/webauth/AdminWebauthAction.java b/src/main/java/org/codelibs/fess/app/web/admin/webauth/AdminWebauthAction.java index de713a2ec..4c2ccfd76 100644 --- a/src/main/java/org/codelibs/fess/app/web/admin/webauth/AdminWebauthAction.java +++ b/src/main/java/org/codelibs/fess/app/web/admin/webauth/AdminWebauthAction.java @@ -24,7 +24,7 @@ import java.util.Map; import javax.annotation.Resource; import org.codelibs.fess.Constants; -import org.codelibs.fess.app.pager.WebAuthenticationPager; +import org.codelibs.fess.app.pager.WebAuthPager; import org.codelibs.fess.app.service.WebAuthenticationService; import org.codelibs.fess.app.service.WebConfigService; import org.codelibs.fess.app.web.CrudMode; @@ -54,7 +54,7 @@ public class AdminWebauthAction extends FessAdminAction { @Resource private WebAuthenticationService webAuthenticationService; @Resource - private WebAuthenticationPager webAuthenticationPager; + private WebAuthPager webAuthPager; @Resource private SystemHelper systemHelper; @@ -81,9 +81,9 @@ public class AdminWebauthAction extends FessAdminAction { @Execute public HtmlResponse list(final OptionalThing pageNumber, final SearchForm form) { pageNumber.ifPresent(num -> { - webAuthenticationPager.setCurrentPageNumber(pageNumber.get()); + webAuthPager.setCurrentPageNumber(pageNumber.get()); }).orElse(() -> { - webAuthenticationPager.setCurrentPageNumber(0); + webAuthPager.setCurrentPageNumber(0); }); return asHtml(path_AdminWebauth_AdminWebauthJsp).renderWith(data -> { searchPaging(data, form); @@ -92,7 +92,7 @@ public class AdminWebauthAction extends FessAdminAction { @Execute public HtmlResponse search(final SearchForm form) { - copyBeanToBean(form, webAuthenticationPager, op -> op.exclude(Constants.PAGER_CONVERSION_RULE)); + copyBeanToBean(form, webAuthPager, op -> op.exclude(Constants.PAGER_CONVERSION_RULE)); return asHtml(path_AdminWebauth_AdminWebauthJsp).renderWith(data -> { searchPaging(data, form); }); @@ -100,17 +100,17 @@ public class AdminWebauthAction extends FessAdminAction { @Execute public HtmlResponse reset(final SearchForm form) { - webAuthenticationPager.clear(); + webAuthPager.clear(); return asHtml(path_AdminWebauth_AdminWebauthJsp).renderWith(data -> { searchPaging(data, form); }); } protected void searchPaging(final RenderData data, final SearchForm form) { - data.register("webAuthenticationItems", webAuthenticationService.getWebAuthenticationList(webAuthenticationPager)); // page navi + data.register("webAuthenticationItems", webAuthenticationService.getWebAuthenticationList(webAuthPager)); // page navi data.register("displayCreateLink", !webConfigService.getAllWebConfigList(false, false, false, null).isEmpty()); // restore from pager - copyBeanToBean(webAuthenticationPager, form, op -> op.include("id")); + copyBeanToBean(webAuthPager, form, op -> op.include("id")); } // =================================================================================== @@ -298,11 +298,11 @@ public class AdminWebauthAction extends FessAdminAction { private HtmlResponse asListHtml() { return asHtml(path_AdminWebauth_AdminWebauthJsp).renderWith(data -> { - data.register("webAuthenticationItems", webAuthenticationService.getWebAuthenticationList(webAuthenticationPager)); // page navi + data.register("webAuthenticationItems", webAuthenticationService.getWebAuthenticationList(webAuthPager)); // page navi data.register("displayCreateLink", !webConfigService.getAllWebConfigList(false, false, false, null).isEmpty()); }).useForm(SearchForm.class, setup -> { setup.setup(form -> { - copyBeanToBean(webAuthenticationPager, form, op -> op.include("id")); + copyBeanToBean(webAuthPager, form, op -> op.include("id")); }); }); } diff --git a/src/main/java/org/codelibs/fess/crawler/FessCrawlerThread.java b/src/main/java/org/codelibs/fess/crawler/FessCrawlerThread.java index 9a0d74246..936c83db2 100644 --- a/src/main/java/org/codelibs/fess/crawler/FessCrawlerThread.java +++ b/src/main/java/org/codelibs/fess/crawler/FessCrawlerThread.java @@ -37,7 +37,7 @@ import org.codelibs.fess.crawler.log.LogType; import org.codelibs.fess.es.client.FessEsClient; import org.codelibs.fess.es.config.exentity.CrawlingConfig; import org.codelibs.fess.helper.CrawlingConfigHelper; -import org.codelibs.fess.helper.CrawlingSessionHelper; +import org.codelibs.fess.helper.CrawlingInfoHelper; import org.codelibs.fess.helper.IndexingHelper; import org.codelibs.fess.helper.SambaHelper; import org.codelibs.fess.mylasta.direction.FessConfig; @@ -61,7 +61,7 @@ public class FessCrawlerThread extends CrawlerThread { final FessConfig fessConfig = ComponentUtil.getFessConfig(); final CrawlingConfigHelper crawlingConfigHelper = ComponentUtil.getCrawlingConfigHelper(); - final CrawlingSessionHelper crawlingSessionHelper = ComponentUtil.getCrawlingSessionHelper(); + final CrawlingInfoHelper crawlingInfoHelper = ComponentUtil.getCrawlingInfoHelper(); final SambaHelper sambaHelper = ComponentUtil.getSambaHelper(); final IndexingHelper indexingHelper = ComponentUtil.getIndexingHelper(); final FessEsClient fessEsClient = ComponentUtil.getElasticsearchClient(); @@ -96,7 +96,7 @@ public class FessCrawlerThread extends CrawlerThread { } } dataMap.put(fessConfig.getIndexFieldRole(), roleTypeList); - final String id = crawlingSessionHelper.generateId(dataMap); + final String id = crawlingInfoHelper.generateId(dataMap); final Map document = indexingHelper.getDocument( diff --git a/src/main/java/org/codelibs/fess/crawler/transformer/AbstractFessFileTransformer.java b/src/main/java/org/codelibs/fess/crawler/transformer/AbstractFessFileTransformer.java index 5f79c25f8..6f4410134 100644 --- a/src/main/java/org/codelibs/fess/crawler/transformer/AbstractFessFileTransformer.java +++ b/src/main/java/org/codelibs/fess/crawler/transformer/AbstractFessFileTransformer.java @@ -50,7 +50,7 @@ import org.codelibs.fess.crawler.util.CrawlingParameterUtil; import org.codelibs.fess.es.config.exentity.CrawlingConfig; import org.codelibs.fess.es.config.exentity.CrawlingConfig.ConfigName; import org.codelibs.fess.helper.CrawlingConfigHelper; -import org.codelibs.fess.helper.CrawlingSessionHelper; +import org.codelibs.fess.helper.CrawlingInfoHelper; import org.codelibs.fess.helper.FileTypeHelper; import org.codelibs.fess.helper.LabelTypeHelper; import org.codelibs.fess.helper.PathMappingHelper; @@ -156,15 +156,15 @@ public abstract class AbstractFessFileTransformer extends AbstractFessXpathTrans resultData.setTransformerName(getName()); final FessConfig fessConfig = ComponentUtil.getFessConfig(); - final CrawlingSessionHelper crawlingSessionHelper = ComponentUtil.getCrawlingSessionHelper(); - final String sessionId = crawlingSessionHelper.getCanonicalSessionId(responseData.getSessionId()); + final CrawlingInfoHelper crawlingInfoHelper = ComponentUtil.getCrawlingInfoHelper(); + final String sessionId = crawlingInfoHelper.getCanonicalSessionId(responseData.getSessionId()); final PathMappingHelper pathMappingHelper = ComponentUtil.getPathMappingHelper(); final SambaHelper sambaHelper = ComponentUtil.getSambaHelper(); final DynamicProperties crawlerProperties = ComponentUtil.getCrawlerProperties(); final boolean useAclAsRole = crawlerProperties.getProperty(Constants.USE_ACL_AS_ROLE, Constants.FALSE).equals(Constants.TRUE); final CrawlingConfigHelper crawlingConfigHelper = ComponentUtil.getCrawlingConfigHelper(); final CrawlingConfig crawlingConfig = crawlingConfigHelper.get(responseData.getSessionId()); - final Date documentExpires = crawlingSessionHelper.getDocumentExpires(crawlingConfig); + final Date documentExpires = crawlingInfoHelper.getDocumentExpires(crawlingConfig); final SystemHelper systemHelper = ComponentUtil.getSystemHelper(); final FileTypeHelper fileTypeHelper = ComponentUtil.getFileTypeHelper(); String url = responseData.getUrl(); @@ -299,13 +299,13 @@ public abstract class AbstractFessFileTransformer extends AbstractFessXpathTrans // TODO date // TODO lang // id - putResultDataBody(dataMap, fessConfig.getIndexFieldId(), crawlingSessionHelper.generateId(dataMap)); + putResultDataBody(dataMap, fessConfig.getIndexFieldId(), crawlingInfoHelper.generateId(dataMap)); // parentId String parentUrl = responseData.getParentUrl(); if (StringUtil.isNotBlank(parentUrl)) { parentUrl = pathMappingHelper.replaceUrl(sessionId, parentUrl); putResultDataBody(dataMap, fessConfig.getIndexFieldUrl(), parentUrl); - putResultDataBody(dataMap, fessConfig.getIndexFieldParentId(), crawlingSessionHelper.generateId(dataMap)); + putResultDataBody(dataMap, fessConfig.getIndexFieldParentId(), crawlingInfoHelper.generateId(dataMap)); putResultDataBody(dataMap, fessConfig.getIndexFieldUrl(), url); // set again } diff --git a/src/main/java/org/codelibs/fess/crawler/transformer/FessXpathTransformer.java b/src/main/java/org/codelibs/fess/crawler/transformer/FessXpathTransformer.java index 9318f69c1..d18bd0e85 100644 --- a/src/main/java/org/codelibs/fess/crawler/transformer/FessXpathTransformer.java +++ b/src/main/java/org/codelibs/fess/crawler/transformer/FessXpathTransformer.java @@ -52,7 +52,7 @@ import org.codelibs.fess.crawler.util.ResponseDataUtil; import org.codelibs.fess.es.config.exentity.CrawlingConfig; import org.codelibs.fess.es.config.exentity.CrawlingConfig.ConfigName; import org.codelibs.fess.helper.CrawlingConfigHelper; -import org.codelibs.fess.helper.CrawlingSessionHelper; +import org.codelibs.fess.helper.CrawlingInfoHelper; import org.codelibs.fess.helper.DuplicateHostHelper; import org.codelibs.fess.helper.FileTypeHelper; import org.codelibs.fess.helper.LabelTypeHelper; @@ -191,12 +191,12 @@ public class FessXpathTransformer extends AbstractFessXpathTransformer { } final FessConfig fessConfig = ComponentUtil.getFessConfig(); - final CrawlingSessionHelper crawlingSessionHelper = ComponentUtil.getCrawlingSessionHelper(); - final String sessionId = crawlingSessionHelper.getCanonicalSessionId(responseData.getSessionId()); + final CrawlingInfoHelper crawlingInfoHelper = ComponentUtil.getCrawlingInfoHelper(); + final String sessionId = crawlingInfoHelper.getCanonicalSessionId(responseData.getSessionId()); final PathMappingHelper pathMappingHelper = ComponentUtil.getPathMappingHelper(); final CrawlingConfigHelper crawlingConfigHelper = ComponentUtil.getCrawlingConfigHelper(); final CrawlingConfig crawlingConfig = crawlingConfigHelper.get(responseData.getSessionId()); - final Date documentExpires = crawlingSessionHelper.getDocumentExpires(crawlingConfig); + final Date documentExpires = crawlingInfoHelper.getDocumentExpires(crawlingConfig); final SystemHelper systemHelper = ComponentUtil.getSystemHelper(); final FileTypeHelper fileTypeHelper = ComponentUtil.getFileTypeHelper(); String url = responseData.getUrl(); @@ -298,13 +298,13 @@ public class FessXpathTransformer extends AbstractFessXpathTransformer { } putResultDataBody(dataMap, fessConfig.getIndexFieldRole(), roleTypeList); // id - putResultDataBody(dataMap, fessConfig.getIndexFieldId(), crawlingSessionHelper.generateId(dataMap)); + putResultDataBody(dataMap, fessConfig.getIndexFieldId(), crawlingInfoHelper.generateId(dataMap)); // parentId String parentUrl = responseData.getParentUrl(); if (StringUtil.isNotBlank(parentUrl)) { parentUrl = pathMappingHelper.replaceUrl(sessionId, parentUrl); putResultDataBody(dataMap, fessConfig.getIndexFieldUrl(), parentUrl); - putResultDataBody(dataMap, fessConfig.getIndexFieldParentId(), crawlingSessionHelper.generateId(dataMap)); + putResultDataBody(dataMap, fessConfig.getIndexFieldParentId(), crawlingInfoHelper.generateId(dataMap)); putResultDataBody(dataMap, fessConfig.getIndexFieldUrl(), url); // set again } @@ -444,7 +444,7 @@ public class FessXpathTransformer extends AbstractFessXpathTransformer { return buf.toString(); } - protected String replaceOverlappingHost(final String url) { + protected String replaceDuplicateHost(final String url) { try { // remove duplicate host final DuplicateHostHelper duplicateHostHelper = ComponentUtil.getDuplicateHostHelper(); @@ -486,7 +486,7 @@ public class FessXpathTransformer extends AbstractFessXpathTransformer { for (final Map.Entry entry : convertUrlMap.entrySet()) { url = url.replaceAll(entry.getKey(), entry.getValue()); } - requestData.setUrl(replaceOverlappingHost(url)); + requestData.setUrl(replaceDuplicateHost(url)); } } return urlList; diff --git a/src/main/java/org/codelibs/fess/ds/impl/AbstractDataStoreImpl.java b/src/main/java/org/codelibs/fess/ds/impl/AbstractDataStoreImpl.java index 3b77ccda9..15f2b7ea2 100644 --- a/src/main/java/org/codelibs/fess/ds/impl/AbstractDataStoreImpl.java +++ b/src/main/java/org/codelibs/fess/ds/impl/AbstractDataStoreImpl.java @@ -26,7 +26,7 @@ import org.codelibs.fess.Constants; import org.codelibs.fess.ds.DataStore; import org.codelibs.fess.ds.IndexUpdateCallback; import org.codelibs.fess.es.config.exentity.DataConfig; -import org.codelibs.fess.helper.CrawlingSessionHelper; +import org.codelibs.fess.helper.CrawlingInfoHelper; import org.codelibs.fess.helper.SystemHelper; import org.codelibs.fess.mylasta.direction.FessConfig; import org.codelibs.fess.util.ComponentUtil; @@ -53,9 +53,9 @@ public abstract class AbstractDataStoreImpl implements DataStore { public void store(final DataConfig config, final IndexUpdateCallback callback, final Map initParamMap) { final Map configParamMap = config.getHandlerParameterMap(); final Map configScriptMap = config.getHandlerScriptMap(); - final CrawlingSessionHelper crawlingSessionHelper = ComponentUtil.getCrawlingSessionHelper(); + final CrawlingInfoHelper crawlingInfoHelper = ComponentUtil.getCrawlingInfoHelper(); final SystemHelper systemHelper = ComponentUtil.getSystemHelper(); - final Date documentExpires = crawlingSessionHelper.getDocumentExpires(config); + final Date documentExpires = crawlingInfoHelper.getDocumentExpires(config); final FessConfig fessConfig = ComponentUtil.getFessConfig(); initParamMap.putAll(configParamMap); diff --git a/src/main/java/org/codelibs/fess/ds/impl/FileListDataStoreImpl.java b/src/main/java/org/codelibs/fess/ds/impl/FileListDataStoreImpl.java index f4da56c6c..b4eee8237 100644 --- a/src/main/java/org/codelibs/fess/ds/impl/FileListDataStoreImpl.java +++ b/src/main/java/org/codelibs/fess/ds/impl/FileListDataStoreImpl.java @@ -40,7 +40,7 @@ import org.codelibs.fess.ds.DataStoreException; import org.codelibs.fess.ds.IndexUpdateCallback; import org.codelibs.fess.es.client.FessEsClient; import org.codelibs.fess.es.config.exentity.DataConfig; -import org.codelibs.fess.helper.CrawlingSessionHelper; +import org.codelibs.fess.helper.CrawlingInfoHelper; import org.codelibs.fess.helper.IndexingHelper; import org.codelibs.fess.mylasta.direction.FessConfig; import org.codelibs.fess.util.ComponentUtil; @@ -72,7 +72,7 @@ public class FileListDataStoreImpl extends CsvDataStoreImpl { protected CrawlerClientFactory crawlerClientFactory; - protected CrawlingSessionHelper crawlingSessionHelper; + protected CrawlingInfoHelper crawlingInfoHelper; public Map parentEncodingMap = Collections.synchronizedMap(new LruHashMap<>(1000)); @@ -236,7 +236,7 @@ public class FileListDataStoreImpl extends CsvDataStoreImpl { } synchronized (indexUpdateCallback) { - deleteIdList.add(crawlingSessionHelper.generateId(dataMap)); + deleteIdList.add(crawlingInfoHelper.generateId(dataMap)); if (deleteIdList.size() >= maxDeleteDocumentCacheSize) { final IndexingHelper indexingHelper = ComponentUtil.getIndexingHelper(); diff --git a/src/main/java/org/codelibs/fess/ds/impl/IndexUpdateCallbackImpl.java b/src/main/java/org/codelibs/fess/ds/impl/IndexUpdateCallbackImpl.java index c2157f590..4866af0ea 100644 --- a/src/main/java/org/codelibs/fess/ds/impl/IndexUpdateCallbackImpl.java +++ b/src/main/java/org/codelibs/fess/ds/impl/IndexUpdateCallbackImpl.java @@ -23,7 +23,7 @@ import java.util.concurrent.atomic.AtomicLong; import org.codelibs.fess.ds.IndexUpdateCallback; import org.codelibs.fess.es.client.FessEsClient; import org.codelibs.fess.exception.FessSystemException; -import org.codelibs.fess.helper.CrawlingSessionHelper; +import org.codelibs.fess.helper.CrawlingInfoHelper; import org.codelibs.fess.helper.IndexingHelper; import org.codelibs.fess.helper.SearchLogHelper; import org.codelibs.fess.helper.SystemHelper; @@ -68,8 +68,8 @@ public class IndexUpdateCallbackImpl implements IndexUpdateCallback { } final IndexingHelper indexingHelper = ComponentUtil.getIndexingHelper(); - final CrawlingSessionHelper crawlingSessionHelper = ComponentUtil.getCrawlingSessionHelper(); - dataMap.put(fessConfig.getIndexFieldId(), crawlingSessionHelper.generateId(dataMap)); + final CrawlingInfoHelper crawlingInfoHelper = ComponentUtil.getCrawlingInfoHelper(); + dataMap.put(fessConfig.getIndexFieldId(), crawlingInfoHelper.generateId(dataMap)); final String url = dataMap.get(fessConfig.getIndexFieldUrl()).toString(); diff --git a/src/main/java/org/codelibs/fess/es/config/allcommon/EsAbstractBehavior.java b/src/main/java/org/codelibs/fess/es/config/allcommon/EsAbstractBehavior.java index 15bebea3a..f4c828384 100644 --- a/src/main/java/org/codelibs/fess/es/config/allcommon/EsAbstractBehavior.java +++ b/src/main/java/org/codelibs/fess/es/config/allcommon/EsAbstractBehavior.java @@ -25,8 +25,11 @@ import java.util.function.Function; import javax.annotation.Resource; +import org.codelibs.fess.es.config.allcommon.EsAbstractEntity; import org.codelibs.fess.es.config.allcommon.EsAbstractEntity.DocMeta; import org.codelibs.fess.es.config.allcommon.EsAbstractEntity.RequestOptionCall; +import org.codelibs.fess.es.config.allcommon.EsAbstractConditionBean; +import org.codelibs.fess.es.config.allcommon.EsPagingResultBean; import org.dbflute.Entity; import org.dbflute.bhv.AbstractBehaviorWritable; import org.dbflute.bhv.readable.EntityRowHandler; @@ -70,11 +73,8 @@ public abstract class EsAbstractBehavior RESULT createEntity(Map source, Class entityType); // =================================================================================== @@ -178,9 +178,8 @@ public abstract class EsAbstractBehavior handler) { - final SearchRequestBuilder builder = - client.prepareSearch(asEsIndex()).setTypes(asEsIndexType()).setSearchType(SearchType.SCAN).setScroll(scrollForCursor) - .setSize(sizeForCursor); + final SearchRequestBuilder builder = client.prepareSearch(asEsIndex()).setTypes(asEsIndexType()).setSearchType(SearchType.SCAN) + .setScroll(scrollForCursor).setSize(sizeForCursor); ((EsAbstractConditionBean) cb).request().build(builder); final SearchResponse response = ((EsAbstractConditionBean) cb).build(builder).execute().actionGet(); @@ -288,9 +287,8 @@ public abstract class EsAbstractBehavior option) { - final SearchRequestBuilder builder = - client.prepareSearch(asEsIndex()).setTypes(asEsIndexType()).setSearchType(SearchType.SCAN).setScroll(scrollForDelete) - .setSize(sizeForDelete); + final SearchRequestBuilder builder = client.prepareSearch(asEsIndex()).setTypes(asEsIndexType()).setSearchType(SearchType.SCAN) + .setScroll(scrollForDelete).setSize(sizeForDelete); ((EsAbstractConditionBean) cb).request().build(builder); final SearchResponse response = ((EsAbstractConditionBean) cb).build(builder).execute().actionGet(); @@ -389,7 +387,6 @@ public abstract class EsAbstractBehavior mustList, List shouldList, List mustNotList, - List filterList) { + protected BoolQueryBuilder regBoolCQ(List mustList, List shouldList, List mustNotList, List filterList) { assertObjectNotNull("mustList", mustList); assertObjectNotNull("shouldList", shouldList); assertObjectNotNull("mustNotList", mustNotList); @@ -273,6 +272,7 @@ public abstract class EsAbstractConditionQuery implements ConditionQuery { registerOrderBy(field, false); } + protected void registerOrderBy(String field, boolean ascOrDesc) { assertObjectNotNull("field", field); if (fieldSortBuilderList == null) { @@ -285,7 +285,7 @@ public abstract class EsAbstractConditionQuery implements ConditionQuery { // Invalid Query // ============= protected void checkEsInvalidQuery(String name, Object value) { - if (value == null || (value instanceof String && ((String) value).isEmpty())) { + if (value == null || (value instanceof String && ((String)value).isEmpty())) { String msg = "Cannot register null or empty query: name=" + name + " value=" + value; throw new InvalidQueryRegisteredException(msg); } @@ -479,3 +479,4 @@ public abstract class EsAbstractConditionQuery implements ConditionQuery { void callback(CQ and); } } + diff --git a/src/main/java/org/codelibs/fess/es/config/allcommon/EsAbstractEntity.java b/src/main/java/org/codelibs/fess/es/config/allcommon/EsAbstractEntity.java index daee888d5..448a8f518 100644 --- a/src/main/java/org/codelibs/fess/es/config/allcommon/EsAbstractEntity.java +++ b/src/main/java/org/codelibs/fess/es/config/allcommon/EsAbstractEntity.java @@ -283,3 +283,4 @@ public abstract class EsAbstractEntity implements Entity, Serializable, Cloneabl void callback(OP op); } } + diff --git a/src/main/java/org/codelibs/fess/es/config/allcommon/EsPagingResultBean.java b/src/main/java/org/codelibs/fess/es/config/allcommon/EsPagingResultBean.java index 1a135f16e..95f4ca5ef 100644 --- a/src/main/java/org/codelibs/fess/es/config/allcommon/EsPagingResultBean.java +++ b/src/main/java/org/codelibs/fess/es/config/allcommon/EsPagingResultBean.java @@ -62,3 +62,4 @@ public class EsPagingResultBean extends PagingResultBean { this.failedShards = failedShards; } } + diff --git a/src/main/java/org/codelibs/fess/es/config/bsbhv/BsBoostDocumentRuleBhv.java b/src/main/java/org/codelibs/fess/es/config/bsbhv/BsBoostDocumentRuleBhv.java index 24bfcfc92..63ee7b01f 100644 --- a/src/main/java/org/codelibs/fess/es/config/bsbhv/BsBoostDocumentRuleBhv.java +++ b/src/main/java/org/codelibs/fess/es/config/bsbhv/BsBoostDocumentRuleBhv.java @@ -172,7 +172,7 @@ public abstract class BsBoostDocumentRuleBhv extends EsAbstractBehavior cbLambda, EntityRowHandler> entityLambda) { - delegateSelectBulk(createCB(cbLambda), entityLambda, typeOfSelectedEntity()); + delegateSelectBulk(createCB(cbLambda), entityLambda,typeOfSelectedEntity()); } // =================================================================================== @@ -252,3 +252,4 @@ public abstract class BsBoostDocumentRuleBhv extends EsAbstractBehavior { +public abstract class BsCrawlingInfoBhv extends EsAbstractBehavior { // =================================================================================== // Control Override @@ -57,21 +57,21 @@ public abstract class BsCrawlingSessionBhv extends EsAbstractBehavior RESULT createEntity(Map source, Class entityType) { + protected RESULT createEntity(Map source, Class entityType) { try { final RESULT result = entityType.newInstance(); result.setCreatedTime(DfTypeUtil.toLong(source.get("createdTime"))); @@ -88,26 +88,26 @@ public abstract class BsCrawlingSessionBhv extends EsAbstractBehavior cbLambda) { + public int selectCount(CBCall cbLambda) { return facadeSelectCount(createCB(cbLambda)); } - public OptionalEntity selectEntity(CBCall cbLambda) { + public OptionalEntity selectEntity(CBCall cbLambda) { return facadeSelectEntity(createCB(cbLambda)); } - protected OptionalEntity facadeSelectEntity(CrawlingSessionCB cb) { + protected OptionalEntity facadeSelectEntity(CrawlingInfoCB cb) { return doSelectOptionalEntity(cb, typeOfSelectedEntity()); } - protected OptionalEntity doSelectOptionalEntity(CrawlingSessionCB cb, + protected OptionalEntity doSelectOptionalEntity(CrawlingInfoCB cb, Class tp) { return createOptionalEntity(doSelectEntity(cb, tp), cb); } @Override - public CrawlingSessionCB newConditionBean() { - return new CrawlingSessionCB(); + public CrawlingInfoCB newConditionBean() { + return new CrawlingInfoCB(); } @Override @@ -115,137 +115,138 @@ public abstract class BsCrawlingSessionBhv extends EsAbstractBehavior cbLambda) { + public CrawlingInfo selectEntityWithDeletedCheck(CBCall cbLambda) { return facadeSelectEntityWithDeletedCheck(createCB(cbLambda)); } - public OptionalEntity selectByPK(String id) { + public OptionalEntity selectByPK(String id) { return facadeSelectByPK(id); } - protected OptionalEntity facadeSelectByPK(String id) { + protected OptionalEntity facadeSelectByPK(String id) { return doSelectOptionalByPK(id, typeOfSelectedEntity()); } - protected ENTITY doSelectByPK(String id, Class tp) { + protected ENTITY doSelectByPK(String id, Class tp) { return doSelectEntity(xprepareCBAsPK(id), tp); } - protected CrawlingSessionCB xprepareCBAsPK(String id) { + protected CrawlingInfoCB xprepareCBAsPK(String id) { assertObjectNotNull("id", id); return newConditionBean().acceptPK(id); } - protected OptionalEntity doSelectOptionalByPK(String id, Class tp) { + protected OptionalEntity doSelectOptionalByPK(String id, Class tp) { return createOptionalEntity(doSelectByPK(id, tp), id); } @Override - protected Class typeOfSelectedEntity() { - return CrawlingSession.class; + protected Class typeOfSelectedEntity() { + return CrawlingInfo.class; } @Override - protected Class typeOfHandlingEntity() { - return CrawlingSession.class; + protected Class typeOfHandlingEntity() { + return CrawlingInfo.class; } @Override - protected Class typeOfHandlingConditionBean() { - return CrawlingSessionCB.class; + protected Class typeOfHandlingConditionBean() { + return CrawlingInfoCB.class; } - public ListResultBean selectList(CBCall cbLambda) { + public ListResultBean selectList(CBCall cbLambda) { return facadeSelectList(createCB(cbLambda)); } - public PagingResultBean selectPage(CBCall cbLambda) { + public PagingResultBean selectPage(CBCall cbLambda) { // #pending same? - return (PagingResultBean) facadeSelectList(createCB(cbLambda)); + return (PagingResultBean) facadeSelectList(createCB(cbLambda)); } - public void selectCursor(CBCall cbLambda, EntityRowHandler entityLambda) { + public void selectCursor(CBCall cbLambda, EntityRowHandler entityLambda) { facadeSelectCursor(createCB(cbLambda), entityLambda); } - public void selectBulk(CBCall cbLambda, EntityRowHandler> entityLambda) { - delegateSelectBulk(createCB(cbLambda), entityLambda, typeOfSelectedEntity()); + public void selectBulk(CBCall cbLambda, EntityRowHandler> entityLambda) { + delegateSelectBulk(createCB(cbLambda), entityLambda,typeOfSelectedEntity()); } // =================================================================================== // Update // ====== - public void insert(CrawlingSession entity) { + public void insert(CrawlingInfo entity) { doInsert(entity, null); } - public void insert(CrawlingSession entity, RequestOptionCall opLambda) { + public void insert(CrawlingInfo entity, RequestOptionCall opLambda) { if (entity instanceof EsAbstractEntity) { entity.asDocMeta().indexOption(opLambda); } doInsert(entity, null); } - public void update(CrawlingSession entity) { + public void update(CrawlingInfo entity) { doUpdate(entity, null); } - public void update(CrawlingSession entity, RequestOptionCall opLambda) { + public void update(CrawlingInfo entity, RequestOptionCall opLambda) { if (entity instanceof EsAbstractEntity) { entity.asDocMeta().indexOption(opLambda); } doUpdate(entity, null); } - public void insertOrUpdate(CrawlingSession entity) { + public void insertOrUpdate(CrawlingInfo entity) { doInsertOrUpdate(entity, null, null); } - public void insertOrUpdate(CrawlingSession entity, RequestOptionCall opLambda) { + public void insertOrUpdate(CrawlingInfo entity, RequestOptionCall opLambda) { if (entity instanceof EsAbstractEntity) { entity.asDocMeta().indexOption(opLambda); } doInsertOrUpdate(entity, null, null); } - public void delete(CrawlingSession entity) { + public void delete(CrawlingInfo entity) { doDelete(entity, null); } - public void delete(CrawlingSession entity, RequestOptionCall opLambda) { + public void delete(CrawlingInfo entity, RequestOptionCall opLambda) { if (entity instanceof EsAbstractEntity) { entity.asDocMeta().deleteOption(opLambda); } doDelete(entity, null); } - public int queryDelete(CBCall cbLambda) { + public int queryDelete(CBCall cbLambda) { return doQueryDelete(createCB(cbLambda), null); } - public int[] batchInsert(List list) { + public int[] batchInsert(List list) { return batchInsert(list, null); } - public int[] batchInsert(List list, RequestOptionCall call) { + public int[] batchInsert(List list, RequestOptionCall call) { return doBatchInsert(new BulkList<>(list, call), null); } - public int[] batchUpdate(List list) { + public int[] batchUpdate(List list) { return batchUpdate(list, null); } - public int[] batchUpdate(List list, RequestOptionCall call) { + public int[] batchUpdate(List list, RequestOptionCall call) { return doBatchUpdate(new BulkList<>(list, call), null); } - public int[] batchDelete(List list) { + public int[] batchDelete(List list) { return batchDelete(list, null); } - public int[] batchDelete(List list, RequestOptionCall call) { + public int[] batchDelete(List list, RequestOptionCall call) { return doBatchDelete(new BulkList<>(list, call), null); } // #pending create, modify, remove } + diff --git a/src/main/java/org/codelibs/fess/es/config/bsbhv/BsCrawlingSessionInfoBhv.java b/src/main/java/org/codelibs/fess/es/config/bsbhv/BsCrawlingInfoParamBhv.java similarity index 58% rename from src/main/java/org/codelibs/fess/es/config/bsbhv/BsCrawlingSessionInfoBhv.java rename to src/main/java/org/codelibs/fess/es/config/bsbhv/BsCrawlingInfoParamBhv.java index 00731e67c..d85425bb2 100644 --- a/src/main/java/org/codelibs/fess/es/config/bsbhv/BsCrawlingSessionInfoBhv.java +++ b/src/main/java/org/codelibs/fess/es/config/bsbhv/BsCrawlingInfoParamBhv.java @@ -21,9 +21,9 @@ import java.util.Map; import org.codelibs.fess.es.config.allcommon.EsAbstractBehavior; import org.codelibs.fess.es.config.allcommon.EsAbstractEntity; import org.codelibs.fess.es.config.allcommon.EsAbstractEntity.RequestOptionCall; -import org.codelibs.fess.es.config.bsentity.dbmeta.CrawlingSessionInfoDbm; -import org.codelibs.fess.es.config.cbean.CrawlingSessionInfoCB; -import org.codelibs.fess.es.config.exentity.CrawlingSessionInfo; +import org.codelibs.fess.es.config.bsentity.dbmeta.CrawlingInfoParamDbm; +import org.codelibs.fess.es.config.cbean.CrawlingInfoParamCB; +import org.codelibs.fess.es.config.exentity.CrawlingInfoParam; import org.dbflute.Entity; import org.dbflute.bhv.readable.CBCall; import org.dbflute.bhv.readable.EntityRowHandler; @@ -40,7 +40,7 @@ import org.elasticsearch.action.index.IndexRequestBuilder; /** * @author ESFlute (using FreeGen) */ -public abstract class BsCrawlingSessionInfoBhv extends EsAbstractBehavior { +public abstract class BsCrawlingInfoParamBhv extends EsAbstractBehavior { // =================================================================================== // Control Override @@ -57,24 +57,24 @@ public abstract class BsCrawlingSessionInfoBhv extends EsAbstractBehavior RESULT createEntity(Map source, Class entityType) { + protected RESULT createEntity(Map source, Class entityType) { try { final RESULT result = entityType.newInstance(); - result.setCrawlingSessionId(DfTypeUtil.toString(source.get("crawlingSessionId"))); + result.setCrawlingInfoId(DfTypeUtil.toString(source.get("crawlingInfoId"))); result.setCreatedTime(DfTypeUtil.toLong(source.get("createdTime"))); result.setKey(DfTypeUtil.toString(source.get("key"))); result.setValue(DfTypeUtil.toString(source.get("value"))); @@ -88,26 +88,26 @@ public abstract class BsCrawlingSessionInfoBhv extends EsAbstractBehavior cbLambda) { + public int selectCount(CBCall cbLambda) { return facadeSelectCount(createCB(cbLambda)); } - public OptionalEntity selectEntity(CBCall cbLambda) { + public OptionalEntity selectEntity(CBCall cbLambda) { return facadeSelectEntity(createCB(cbLambda)); } - protected OptionalEntity facadeSelectEntity(CrawlingSessionInfoCB cb) { + protected OptionalEntity facadeSelectEntity(CrawlingInfoParamCB cb) { return doSelectOptionalEntity(cb, typeOfSelectedEntity()); } - protected OptionalEntity doSelectOptionalEntity(CrawlingSessionInfoCB cb, + protected OptionalEntity doSelectOptionalEntity(CrawlingInfoParamCB cb, Class tp) { return createOptionalEntity(doSelectEntity(cb, tp), cb); } @Override - public CrawlingSessionInfoCB newConditionBean() { - return new CrawlingSessionInfoCB(); + public CrawlingInfoParamCB newConditionBean() { + return new CrawlingInfoParamCB(); } @Override @@ -115,137 +115,138 @@ public abstract class BsCrawlingSessionInfoBhv extends EsAbstractBehavior cbLambda) { + public CrawlingInfoParam selectEntityWithDeletedCheck(CBCall cbLambda) { return facadeSelectEntityWithDeletedCheck(createCB(cbLambda)); } - public OptionalEntity selectByPK(String id) { + public OptionalEntity selectByPK(String id) { return facadeSelectByPK(id); } - protected OptionalEntity facadeSelectByPK(String id) { + protected OptionalEntity facadeSelectByPK(String id) { return doSelectOptionalByPK(id, typeOfSelectedEntity()); } - protected ENTITY doSelectByPK(String id, Class tp) { + protected ENTITY doSelectByPK(String id, Class tp) { return doSelectEntity(xprepareCBAsPK(id), tp); } - protected CrawlingSessionInfoCB xprepareCBAsPK(String id) { + protected CrawlingInfoParamCB xprepareCBAsPK(String id) { assertObjectNotNull("id", id); return newConditionBean().acceptPK(id); } - protected OptionalEntity doSelectOptionalByPK(String id, Class tp) { + protected OptionalEntity doSelectOptionalByPK(String id, Class tp) { return createOptionalEntity(doSelectByPK(id, tp), id); } @Override - protected Class typeOfSelectedEntity() { - return CrawlingSessionInfo.class; + protected Class typeOfSelectedEntity() { + return CrawlingInfoParam.class; } @Override - protected Class typeOfHandlingEntity() { - return CrawlingSessionInfo.class; + protected Class typeOfHandlingEntity() { + return CrawlingInfoParam.class; } @Override - protected Class typeOfHandlingConditionBean() { - return CrawlingSessionInfoCB.class; + protected Class typeOfHandlingConditionBean() { + return CrawlingInfoParamCB.class; } - public ListResultBean selectList(CBCall cbLambda) { + public ListResultBean selectList(CBCall cbLambda) { return facadeSelectList(createCB(cbLambda)); } - public PagingResultBean selectPage(CBCall cbLambda) { + public PagingResultBean selectPage(CBCall cbLambda) { // #pending same? - return (PagingResultBean) facadeSelectList(createCB(cbLambda)); + return (PagingResultBean) facadeSelectList(createCB(cbLambda)); } - public void selectCursor(CBCall cbLambda, EntityRowHandler entityLambda) { + public void selectCursor(CBCall cbLambda, EntityRowHandler entityLambda) { facadeSelectCursor(createCB(cbLambda), entityLambda); } - public void selectBulk(CBCall cbLambda, EntityRowHandler> entityLambda) { - delegateSelectBulk(createCB(cbLambda), entityLambda, typeOfSelectedEntity()); + public void selectBulk(CBCall cbLambda, EntityRowHandler> entityLambda) { + delegateSelectBulk(createCB(cbLambda), entityLambda,typeOfSelectedEntity()); } // =================================================================================== // Update // ====== - public void insert(CrawlingSessionInfo entity) { + public void insert(CrawlingInfoParam entity) { doInsert(entity, null); } - public void insert(CrawlingSessionInfo entity, RequestOptionCall opLambda) { + public void insert(CrawlingInfoParam entity, RequestOptionCall opLambda) { if (entity instanceof EsAbstractEntity) { entity.asDocMeta().indexOption(opLambda); } doInsert(entity, null); } - public void update(CrawlingSessionInfo entity) { + public void update(CrawlingInfoParam entity) { doUpdate(entity, null); } - public void update(CrawlingSessionInfo entity, RequestOptionCall opLambda) { + public void update(CrawlingInfoParam entity, RequestOptionCall opLambda) { if (entity instanceof EsAbstractEntity) { entity.asDocMeta().indexOption(opLambda); } doUpdate(entity, null); } - public void insertOrUpdate(CrawlingSessionInfo entity) { + public void insertOrUpdate(CrawlingInfoParam entity) { doInsertOrUpdate(entity, null, null); } - public void insertOrUpdate(CrawlingSessionInfo entity, RequestOptionCall opLambda) { + public void insertOrUpdate(CrawlingInfoParam entity, RequestOptionCall opLambda) { if (entity instanceof EsAbstractEntity) { entity.asDocMeta().indexOption(opLambda); } doInsertOrUpdate(entity, null, null); } - public void delete(CrawlingSessionInfo entity) { + public void delete(CrawlingInfoParam entity) { doDelete(entity, null); } - public void delete(CrawlingSessionInfo entity, RequestOptionCall opLambda) { + public void delete(CrawlingInfoParam entity, RequestOptionCall opLambda) { if (entity instanceof EsAbstractEntity) { entity.asDocMeta().deleteOption(opLambda); } doDelete(entity, null); } - public int queryDelete(CBCall cbLambda) { + public int queryDelete(CBCall cbLambda) { return doQueryDelete(createCB(cbLambda), null); } - public int[] batchInsert(List list) { + public int[] batchInsert(List list) { return batchInsert(list, null); } - public int[] batchInsert(List list, RequestOptionCall call) { + public int[] batchInsert(List list, RequestOptionCall call) { return doBatchInsert(new BulkList<>(list, call), null); } - public int[] batchUpdate(List list) { + public int[] batchUpdate(List list) { return batchUpdate(list, null); } - public int[] batchUpdate(List list, RequestOptionCall call) { + public int[] batchUpdate(List list, RequestOptionCall call) { return doBatchUpdate(new BulkList<>(list, call), null); } - public int[] batchDelete(List list) { + public int[] batchDelete(List list) { return batchDelete(list, null); } - public int[] batchDelete(List list, RequestOptionCall call) { + public int[] batchDelete(List list, RequestOptionCall call) { return doBatchDelete(new BulkList<>(list, call), null); } // #pending create, modify, remove } + diff --git a/src/main/java/org/codelibs/fess/es/config/bsbhv/BsDataConfigBhv.java b/src/main/java/org/codelibs/fess/es/config/bsbhv/BsDataConfigBhv.java index ccf95c26b..249ba9bae 100644 --- a/src/main/java/org/codelibs/fess/es/config/bsbhv/BsDataConfigBhv.java +++ b/src/main/java/org/codelibs/fess/es/config/bsbhv/BsDataConfigBhv.java @@ -107,7 +107,8 @@ public abstract class BsDataConfigBhv extends EsAbstractBehavior OptionalEntity doSelectOptionalEntity(DataConfigCB cb, Class tp) { + protected OptionalEntity doSelectOptionalEntity(DataConfigCB cb, + Class tp) { return createOptionalEntity(doSelectEntity(cb, tp), cb); } @@ -175,7 +176,7 @@ public abstract class BsDataConfigBhv extends EsAbstractBehavior cbLambda, EntityRowHandler> entityLambda) { - delegateSelectBulk(createCB(cbLambda), entityLambda, typeOfSelectedEntity()); + delegateSelectBulk(createCB(cbLambda), entityLambda,typeOfSelectedEntity()); } // =================================================================================== @@ -255,3 +256,4 @@ public abstract class BsDataConfigBhv extends EsAbstractBehavior cbLambda, EntityRowHandler> entityLambda) { - delegateSelectBulk(createCB(cbLambda), entityLambda, typeOfSelectedEntity()); + delegateSelectBulk(createCB(cbLambda), entityLambda,typeOfSelectedEntity()); } // =================================================================================== @@ -247,3 +247,4 @@ public abstract class BsDataConfigToLabelBhv extends EsAbstractBehavior cbLambda, EntityRowHandler> entityLambda) { - delegateSelectBulk(createCB(cbLambda), entityLambda, typeOfSelectedEntity()); + delegateSelectBulk(createCB(cbLambda), entityLambda,typeOfSelectedEntity()); } // =================================================================================== @@ -247,3 +247,4 @@ public abstract class BsDataConfigToRoleBhv extends EsAbstractBehavior OptionalEntity doSelectOptionalEntity(DuplicateHostCB cb, Class tp) { + protected OptionalEntity doSelectOptionalEntity(DuplicateHostCB cb, + Class tp) { return createOptionalEntity(doSelectEntity(cb, tp), cb); } @@ -171,7 +172,7 @@ public abstract class BsDuplicateHostBhv extends EsAbstractBehavior cbLambda, EntityRowHandler> entityLambda) { - delegateSelectBulk(createCB(cbLambda), entityLambda, typeOfSelectedEntity()); + delegateSelectBulk(createCB(cbLambda), entityLambda,typeOfSelectedEntity()); } // =================================================================================== @@ -251,3 +252,4 @@ public abstract class BsDuplicateHostBhv extends EsAbstractBehavior OptionalEntity doSelectOptionalEntity(FailureUrlCB cb, Class tp) { + protected OptionalEntity doSelectOptionalEntity(FailureUrlCB cb, + Class tp) { return createOptionalEntity(doSelectEntity(cb, tp), cb); } @@ -171,7 +172,7 @@ public abstract class BsFailureUrlBhv extends EsAbstractBehavior cbLambda, EntityRowHandler> entityLambda) { - delegateSelectBulk(createCB(cbLambda), entityLambda, typeOfSelectedEntity()); + delegateSelectBulk(createCB(cbLambda), entityLambda,typeOfSelectedEntity()); } // =================================================================================== @@ -251,3 +252,4 @@ public abstract class BsFailureUrlBhv extends EsAbstractBehavior cbLambda, EntityRowHandler> entityLambda) { - delegateSelectBulk(createCB(cbLambda), entityLambda, typeOfSelectedEntity()); + delegateSelectBulk(createCB(cbLambda), entityLambda,typeOfSelectedEntity()); } // =================================================================================== @@ -256,3 +256,4 @@ public abstract class BsFileAuthenticationBhv extends EsAbstractBehavior OptionalEntity doSelectOptionalEntity(FileConfigCB cb, Class tp) { + protected OptionalEntity doSelectOptionalEntity(FileConfigCB cb, + Class tp) { return createOptionalEntity(doSelectEntity(cb, tp), cb); } @@ -183,7 +184,7 @@ public abstract class BsFileConfigBhv extends EsAbstractBehavior cbLambda, EntityRowHandler> entityLambda) { - delegateSelectBulk(createCB(cbLambda), entityLambda, typeOfSelectedEntity()); + delegateSelectBulk(createCB(cbLambda), entityLambda,typeOfSelectedEntity()); } // =================================================================================== @@ -263,3 +264,4 @@ public abstract class BsFileConfigBhv extends EsAbstractBehavior cbLambda, EntityRowHandler> entityLambda) { - delegateSelectBulk(createCB(cbLambda), entityLambda, typeOfSelectedEntity()); + delegateSelectBulk(createCB(cbLambda), entityLambda,typeOfSelectedEntity()); } // =================================================================================== @@ -247,3 +247,4 @@ public abstract class BsFileConfigToLabelBhv extends EsAbstractBehavior cbLambda, EntityRowHandler> entityLambda) { - delegateSelectBulk(createCB(cbLambda), entityLambda, typeOfSelectedEntity()); + delegateSelectBulk(createCB(cbLambda), entityLambda,typeOfSelectedEntity()); } // =================================================================================== @@ -247,3 +247,4 @@ public abstract class BsFileConfigToRoleBhv extends EsAbstractBehavior { return doSelectOptionalEntity(cb, typeOfSelectedEntity()); } - protected OptionalEntity doSelectOptionalEntity(JobLogCB cb, Class tp) { + protected OptionalEntity doSelectOptionalEntity(JobLogCB cb, + Class tp) { return createOptionalEntity(doSelectEntity(cb, tp), cb); } @@ -172,7 +173,7 @@ public abstract class BsJobLogBhv extends EsAbstractBehavior { } public void selectBulk(CBCall cbLambda, EntityRowHandler> entityLambda) { - delegateSelectBulk(createCB(cbLambda), entityLambda, typeOfSelectedEntity()); + delegateSelectBulk(createCB(cbLambda), entityLambda,typeOfSelectedEntity()); } // =================================================================================== @@ -252,3 +253,4 @@ public abstract class BsJobLogBhv extends EsAbstractBehavior { // #pending create, modify, remove } + diff --git a/src/main/java/org/codelibs/fess/es/config/bsbhv/BsKeyMatchBhv.java b/src/main/java/org/codelibs/fess/es/config/bsbhv/BsKeyMatchBhv.java index 58b062aa2..d66f9af3c 100644 --- a/src/main/java/org/codelibs/fess/es/config/bsbhv/BsKeyMatchBhv.java +++ b/src/main/java/org/codelibs/fess/es/config/bsbhv/BsKeyMatchBhv.java @@ -104,7 +104,8 @@ public abstract class BsKeyMatchBhv extends EsAbstractBehavior OptionalEntity doSelectOptionalEntity(KeyMatchCB cb, Class tp) { + protected OptionalEntity doSelectOptionalEntity(KeyMatchCB cb, + Class tp) { return createOptionalEntity(doSelectEntity(cb, tp), cb); } @@ -172,7 +173,7 @@ public abstract class BsKeyMatchBhv extends EsAbstractBehavior cbLambda, EntityRowHandler> entityLambda) { - delegateSelectBulk(createCB(cbLambda), entityLambda, typeOfSelectedEntity()); + delegateSelectBulk(createCB(cbLambda), entityLambda,typeOfSelectedEntity()); } // =================================================================================== @@ -252,3 +253,4 @@ public abstract class BsKeyMatchBhv extends EsAbstractBehavior OptionalEntity doSelectOptionalEntity(LabelToRoleCB cb, Class tp) { + protected OptionalEntity doSelectOptionalEntity(LabelToRoleCB cb, + Class tp) { return createOptionalEntity(doSelectEntity(cb, tp), cb); } @@ -166,7 +167,7 @@ public abstract class BsLabelToRoleBhv extends EsAbstractBehavior cbLambda, EntityRowHandler> entityLambda) { - delegateSelectBulk(createCB(cbLambda), entityLambda, typeOfSelectedEntity()); + delegateSelectBulk(createCB(cbLambda), entityLambda,typeOfSelectedEntity()); } // =================================================================================== @@ -246,3 +247,4 @@ public abstract class BsLabelToRoleBhv extends EsAbstractBehavior OptionalEntity doSelectOptionalEntity(LabelTypeCB cb, Class tp) { + protected OptionalEntity doSelectOptionalEntity(LabelTypeCB cb, + Class tp) { return createOptionalEntity(doSelectEntity(cb, tp), cb); } @@ -173,7 +174,7 @@ public abstract class BsLabelTypeBhv extends EsAbstractBehavior cbLambda, EntityRowHandler> entityLambda) { - delegateSelectBulk(createCB(cbLambda), entityLambda, typeOfSelectedEntity()); + delegateSelectBulk(createCB(cbLambda), entityLambda,typeOfSelectedEntity()); } // =================================================================================== @@ -253,3 +254,4 @@ public abstract class BsLabelTypeBhv extends EsAbstractBehavior OptionalEntity doSelectOptionalEntity(PathMappingCB cb, Class tp) { + protected OptionalEntity doSelectOptionalEntity(PathMappingCB cb, + Class tp) { return createOptionalEntity(doSelectEntity(cb, tp), cb); } @@ -172,7 +173,7 @@ public abstract class BsPathMappingBhv extends EsAbstractBehavior cbLambda, EntityRowHandler> entityLambda) { - delegateSelectBulk(createCB(cbLambda), entityLambda, typeOfSelectedEntity()); + delegateSelectBulk(createCB(cbLambda), entityLambda,typeOfSelectedEntity()); } // =================================================================================== @@ -252,3 +253,4 @@ public abstract class BsPathMappingBhv extends EsAbstractBehavior OptionalEntity doSelectOptionalEntity(RequestHeaderCB cb, Class tp) { + protected OptionalEntity doSelectOptionalEntity(RequestHeaderCB cb, + Class tp) { return createOptionalEntity(doSelectEntity(cb, tp), cb); } @@ -171,7 +172,7 @@ public abstract class BsRequestHeaderBhv extends EsAbstractBehavior cbLambda, EntityRowHandler> entityLambda) { - delegateSelectBulk(createCB(cbLambda), entityLambda, typeOfSelectedEntity()); + delegateSelectBulk(createCB(cbLambda), entityLambda,typeOfSelectedEntity()); } // =================================================================================== @@ -251,3 +252,4 @@ public abstract class BsRequestHeaderBhv extends EsAbstractBehavior OptionalEntity doSelectOptionalEntity(RoleTypeCB cb, Class tp) { + protected OptionalEntity doSelectOptionalEntity(RoleTypeCB cb, + Class tp) { return createOptionalEntity(doSelectEntity(cb, tp), cb); } @@ -171,7 +172,7 @@ public abstract class BsRoleTypeBhv extends EsAbstractBehavior cbLambda, EntityRowHandler> entityLambda) { - delegateSelectBulk(createCB(cbLambda), entityLambda, typeOfSelectedEntity()); + delegateSelectBulk(createCB(cbLambda), entityLambda,typeOfSelectedEntity()); } // =================================================================================== @@ -251,3 +252,4 @@ public abstract class BsRoleTypeBhv extends EsAbstractBehavior OptionalEntity doSelectOptionalEntity(ScheduledJobCB cb, Class tp) { + protected OptionalEntity doSelectOptionalEntity(ScheduledJobCB cb, + Class tp) { return createOptionalEntity(doSelectEntity(cb, tp), cb); } @@ -177,7 +178,7 @@ public abstract class BsScheduledJobBhv extends EsAbstractBehavior cbLambda, EntityRowHandler> entityLambda) { - delegateSelectBulk(createCB(cbLambda), entityLambda, typeOfSelectedEntity()); + delegateSelectBulk(createCB(cbLambda), entityLambda,typeOfSelectedEntity()); } // =================================================================================== @@ -257,3 +258,4 @@ public abstract class BsScheduledJobBhv extends EsAbstractBehavior OptionalEntity doSelectOptionalEntity(SuggestBadWordCB cb, Class tp) { + protected OptionalEntity doSelectOptionalEntity(SuggestBadWordCB cb, + Class tp) { return createOptionalEntity(doSelectEntity(cb, tp), cb); } @@ -171,7 +172,7 @@ public abstract class BsSuggestBadWordBhv extends EsAbstractBehavior cbLambda, EntityRowHandler> entityLambda) { - delegateSelectBulk(createCB(cbLambda), entityLambda, typeOfSelectedEntity()); + delegateSelectBulk(createCB(cbLambda), entityLambda,typeOfSelectedEntity()); } // =================================================================================== @@ -251,3 +252,4 @@ public abstract class BsSuggestBadWordBhv extends EsAbstractBehavior cbLambda, EntityRowHandler> entityLambda) { - delegateSelectBulk(createCB(cbLambda), entityLambda, typeOfSelectedEntity()); + delegateSelectBulk(createCB(cbLambda), entityLambda,typeOfSelectedEntity()); } // =================================================================================== @@ -254,3 +254,4 @@ public abstract class BsSuggestElevateWordBhv extends EsAbstractBehavior cbLambda, EntityRowHandler> entityLambda) { - delegateSelectBulk(createCB(cbLambda), entityLambda, typeOfSelectedEntity()); + delegateSelectBulk(createCB(cbLambda), entityLambda,typeOfSelectedEntity()); } // =================================================================================== @@ -247,3 +247,4 @@ public abstract class BsSuggestElevateWordToLabelBhv extends EsAbstractBehavior< // #pending create, modify, remove } + diff --git a/src/main/java/org/codelibs/fess/es/config/bsbhv/BsWebAuthenticationBhv.java b/src/main/java/org/codelibs/fess/es/config/bsbhv/BsWebAuthenticationBhv.java index 964e17c4d..69c9b5d03 100644 --- a/src/main/java/org/codelibs/fess/es/config/bsbhv/BsWebAuthenticationBhv.java +++ b/src/main/java/org/codelibs/fess/es/config/bsbhv/BsWebAuthenticationBhv.java @@ -177,7 +177,7 @@ public abstract class BsWebAuthenticationBhv extends EsAbstractBehavior cbLambda, EntityRowHandler> entityLambda) { - delegateSelectBulk(createCB(cbLambda), entityLambda, typeOfSelectedEntity()); + delegateSelectBulk(createCB(cbLambda), entityLambda,typeOfSelectedEntity()); } // =================================================================================== @@ -257,3 +257,4 @@ public abstract class BsWebAuthenticationBhv extends EsAbstractBehavior OptionalEntity doSelectOptionalEntity(WebConfigCB cb, Class tp) { + protected OptionalEntity doSelectOptionalEntity(WebConfigCB cb, + Class tp) { return createOptionalEntity(doSelectEntity(cb, tp), cb); } @@ -184,7 +185,7 @@ public abstract class BsWebConfigBhv extends EsAbstractBehavior cbLambda, EntityRowHandler> entityLambda) { - delegateSelectBulk(createCB(cbLambda), entityLambda, typeOfSelectedEntity()); + delegateSelectBulk(createCB(cbLambda), entityLambda,typeOfSelectedEntity()); } // =================================================================================== @@ -264,3 +265,4 @@ public abstract class BsWebConfigBhv extends EsAbstractBehavior cbLambda, EntityRowHandler> entityLambda) { - delegateSelectBulk(createCB(cbLambda), entityLambda, typeOfSelectedEntity()); + delegateSelectBulk(createCB(cbLambda), entityLambda,typeOfSelectedEntity()); } // =================================================================================== @@ -247,3 +247,4 @@ public abstract class BsWebConfigToLabelBhv extends EsAbstractBehavior cbLambda, EntityRowHandler> entityLambda) { - delegateSelectBulk(createCB(cbLambda), entityLambda, typeOfSelectedEntity()); + delegateSelectBulk(createCB(cbLambda), entityLambda,typeOfSelectedEntity()); } // =================================================================================== @@ -247,3 +247,4 @@ public abstract class BsWebConfigToRoleBhv extends EsAbstractBehavior toSource() { Map sourceMap = new HashMap<>(); - if (crawlingSessionId != null) { - sourceMap.put("crawlingSessionId", crawlingSessionId); + if (crawlingInfoId != null) { + sourceMap.put("crawlingInfoId", crawlingInfoId); } if (createdTime != null) { sourceMap.put("createdTime", createdTime); @@ -91,7 +91,7 @@ public class BsCrawlingSessionInfo extends EsAbstractEntity { @Override protected String doBuildColumnString(String dm) { StringBuilder sb = new StringBuilder(); - sb.append(dm).append(crawlingSessionId); + sb.append(dm).append(crawlingInfoId); sb.append(dm).append(createdTime); sb.append(dm).append(key); sb.append(dm).append(value); @@ -105,14 +105,14 @@ public class BsCrawlingSessionInfo extends EsAbstractEntity { // =================================================================================== // Accessor // ======== - public String getCrawlingSessionId() { - checkSpecifiedProperty("crawlingSessionId"); - return convertEmptyToNull(crawlingSessionId); + public String getCrawlingInfoId() { + checkSpecifiedProperty("crawlingInfoId"); + return convertEmptyToNull(crawlingInfoId); } - public void setCrawlingSessionId(String value) { - registerModifiedProperty("crawlingSessionId"); - this.crawlingSessionId = value; + public void setCrawlingInfoId(String value) { + registerModifiedProperty("crawlingInfoId"); + this.crawlingInfoId = value; } public Long getCreatedTime() { diff --git a/src/main/java/org/codelibs/fess/es/config/bsentity/BsDataConfig.java b/src/main/java/org/codelibs/fess/es/config/bsentity/BsDataConfig.java index 66015b5ef..ec3b65a36 100644 --- a/src/main/java/org/codelibs/fess/es/config/bsentity/BsDataConfig.java +++ b/src/main/java/org/codelibs/fess/es/config/bsentity/BsDataConfig.java @@ -15,7 +15,7 @@ */ package org.codelibs.fess.es.config.bsentity; -import java.time.LocalDateTime; +import java.time.*; import java.util.HashMap; import java.util.Map; diff --git a/src/main/java/org/codelibs/fess/es/config/bsentity/BsDataConfigToLabel.java b/src/main/java/org/codelibs/fess/es/config/bsentity/BsDataConfigToLabel.java index 92cba0e78..bb4571c46 100644 --- a/src/main/java/org/codelibs/fess/es/config/bsentity/BsDataConfigToLabel.java +++ b/src/main/java/org/codelibs/fess/es/config/bsentity/BsDataConfigToLabel.java @@ -15,7 +15,7 @@ */ package org.codelibs.fess.es.config.bsentity; -import java.time.LocalDateTime; +import java.time.*; import java.util.HashMap; import java.util.Map; diff --git a/src/main/java/org/codelibs/fess/es/config/bsentity/BsDataConfigToRole.java b/src/main/java/org/codelibs/fess/es/config/bsentity/BsDataConfigToRole.java index 4d9e6d7cc..e1b97b173 100644 --- a/src/main/java/org/codelibs/fess/es/config/bsentity/BsDataConfigToRole.java +++ b/src/main/java/org/codelibs/fess/es/config/bsentity/BsDataConfigToRole.java @@ -15,7 +15,7 @@ */ package org.codelibs.fess.es.config.bsentity; -import java.time.LocalDateTime; +import java.time.*; import java.util.HashMap; import java.util.Map; diff --git a/src/main/java/org/codelibs/fess/es/config/bsentity/BsDuplicateHost.java b/src/main/java/org/codelibs/fess/es/config/bsentity/BsDuplicateHost.java index 1d16cecad..50b934fdd 100644 --- a/src/main/java/org/codelibs/fess/es/config/bsentity/BsDuplicateHost.java +++ b/src/main/java/org/codelibs/fess/es/config/bsentity/BsDuplicateHost.java @@ -15,7 +15,7 @@ */ package org.codelibs.fess.es.config.bsentity; -import java.time.LocalDateTime; +import java.time.*; import java.util.HashMap; import java.util.Map; diff --git a/src/main/java/org/codelibs/fess/es/config/bsentity/BsFailureUrl.java b/src/main/java/org/codelibs/fess/es/config/bsentity/BsFailureUrl.java index aaeb38525..3fed427cf 100644 --- a/src/main/java/org/codelibs/fess/es/config/bsentity/BsFailureUrl.java +++ b/src/main/java/org/codelibs/fess/es/config/bsentity/BsFailureUrl.java @@ -15,7 +15,7 @@ */ package org.codelibs.fess.es.config.bsentity; -import java.time.LocalDateTime; +import java.time.*; import java.util.HashMap; import java.util.Map; diff --git a/src/main/java/org/codelibs/fess/es/config/bsentity/BsFileAuthentication.java b/src/main/java/org/codelibs/fess/es/config/bsentity/BsFileAuthentication.java index ef8995ece..7f58e4513 100644 --- a/src/main/java/org/codelibs/fess/es/config/bsentity/BsFileAuthentication.java +++ b/src/main/java/org/codelibs/fess/es/config/bsentity/BsFileAuthentication.java @@ -15,7 +15,7 @@ */ package org.codelibs.fess.es.config.bsentity; -import java.time.LocalDateTime; +import java.time.*; import java.util.HashMap; import java.util.Map; diff --git a/src/main/java/org/codelibs/fess/es/config/bsentity/BsFileConfig.java b/src/main/java/org/codelibs/fess/es/config/bsentity/BsFileConfig.java index 744833df5..206800868 100644 --- a/src/main/java/org/codelibs/fess/es/config/bsentity/BsFileConfig.java +++ b/src/main/java/org/codelibs/fess/es/config/bsentity/BsFileConfig.java @@ -15,7 +15,7 @@ */ package org.codelibs.fess.es.config.bsentity; -import java.time.LocalDateTime; +import java.time.*; import java.util.HashMap; import java.util.Map; diff --git a/src/main/java/org/codelibs/fess/es/config/bsentity/BsFileConfigToLabel.java b/src/main/java/org/codelibs/fess/es/config/bsentity/BsFileConfigToLabel.java index 5ea1cd441..545031db7 100644 --- a/src/main/java/org/codelibs/fess/es/config/bsentity/BsFileConfigToLabel.java +++ b/src/main/java/org/codelibs/fess/es/config/bsentity/BsFileConfigToLabel.java @@ -15,7 +15,7 @@ */ package org.codelibs.fess.es.config.bsentity; -import java.time.LocalDateTime; +import java.time.*; import java.util.HashMap; import java.util.Map; diff --git a/src/main/java/org/codelibs/fess/es/config/bsentity/BsFileConfigToRole.java b/src/main/java/org/codelibs/fess/es/config/bsentity/BsFileConfigToRole.java index f9e815a4b..869802493 100644 --- a/src/main/java/org/codelibs/fess/es/config/bsentity/BsFileConfigToRole.java +++ b/src/main/java/org/codelibs/fess/es/config/bsentity/BsFileConfigToRole.java @@ -15,7 +15,7 @@ */ package org.codelibs.fess.es.config.bsentity; -import java.time.LocalDateTime; +import java.time.*; import java.util.HashMap; import java.util.Map; diff --git a/src/main/java/org/codelibs/fess/es/config/bsentity/BsJobLog.java b/src/main/java/org/codelibs/fess/es/config/bsentity/BsJobLog.java index a31cd7dd8..7cf27419d 100644 --- a/src/main/java/org/codelibs/fess/es/config/bsentity/BsJobLog.java +++ b/src/main/java/org/codelibs/fess/es/config/bsentity/BsJobLog.java @@ -15,7 +15,7 @@ */ package org.codelibs.fess.es.config.bsentity; -import java.time.LocalDateTime; +import java.time.*; import java.util.HashMap; import java.util.Map; diff --git a/src/main/java/org/codelibs/fess/es/config/bsentity/BsKeyMatch.java b/src/main/java/org/codelibs/fess/es/config/bsentity/BsKeyMatch.java index ecd3b6077..131077b53 100644 --- a/src/main/java/org/codelibs/fess/es/config/bsentity/BsKeyMatch.java +++ b/src/main/java/org/codelibs/fess/es/config/bsentity/BsKeyMatch.java @@ -15,7 +15,7 @@ */ package org.codelibs.fess.es.config.bsentity; -import java.time.LocalDateTime; +import java.time.*; import java.util.HashMap; import java.util.Map; diff --git a/src/main/java/org/codelibs/fess/es/config/bsentity/BsLabelToRole.java b/src/main/java/org/codelibs/fess/es/config/bsentity/BsLabelToRole.java index d6579b8b7..82dcf851c 100644 --- a/src/main/java/org/codelibs/fess/es/config/bsentity/BsLabelToRole.java +++ b/src/main/java/org/codelibs/fess/es/config/bsentity/BsLabelToRole.java @@ -15,7 +15,7 @@ */ package org.codelibs.fess.es.config.bsentity; -import java.time.LocalDateTime; +import java.time.*; import java.util.HashMap; import java.util.Map; diff --git a/src/main/java/org/codelibs/fess/es/config/bsentity/BsLabelType.java b/src/main/java/org/codelibs/fess/es/config/bsentity/BsLabelType.java index c78b3ac51..260ac81d7 100644 --- a/src/main/java/org/codelibs/fess/es/config/bsentity/BsLabelType.java +++ b/src/main/java/org/codelibs/fess/es/config/bsentity/BsLabelType.java @@ -15,7 +15,7 @@ */ package org.codelibs.fess.es.config.bsentity; -import java.time.LocalDateTime; +import java.time.*; import java.util.HashMap; import java.util.Map; diff --git a/src/main/java/org/codelibs/fess/es/config/bsentity/BsPathMapping.java b/src/main/java/org/codelibs/fess/es/config/bsentity/BsPathMapping.java index 293be0928..301a757c5 100644 --- a/src/main/java/org/codelibs/fess/es/config/bsentity/BsPathMapping.java +++ b/src/main/java/org/codelibs/fess/es/config/bsentity/BsPathMapping.java @@ -15,7 +15,7 @@ */ package org.codelibs.fess.es.config.bsentity; -import java.time.LocalDateTime; +import java.time.*; import java.util.HashMap; import java.util.Map; diff --git a/src/main/java/org/codelibs/fess/es/config/bsentity/BsRequestHeader.java b/src/main/java/org/codelibs/fess/es/config/bsentity/BsRequestHeader.java index 8dcd0fb9a..9c4a05449 100644 --- a/src/main/java/org/codelibs/fess/es/config/bsentity/BsRequestHeader.java +++ b/src/main/java/org/codelibs/fess/es/config/bsentity/BsRequestHeader.java @@ -15,7 +15,7 @@ */ package org.codelibs.fess.es.config.bsentity; -import java.time.LocalDateTime; +import java.time.*; import java.util.HashMap; import java.util.Map; diff --git a/src/main/java/org/codelibs/fess/es/config/bsentity/BsRoleType.java b/src/main/java/org/codelibs/fess/es/config/bsentity/BsRoleType.java index 24633c0de..36e6bb769 100644 --- a/src/main/java/org/codelibs/fess/es/config/bsentity/BsRoleType.java +++ b/src/main/java/org/codelibs/fess/es/config/bsentity/BsRoleType.java @@ -15,7 +15,7 @@ */ package org.codelibs.fess.es.config.bsentity; -import java.time.LocalDateTime; +import java.time.*; import java.util.HashMap; import java.util.Map; diff --git a/src/main/java/org/codelibs/fess/es/config/bsentity/BsScheduledJob.java b/src/main/java/org/codelibs/fess/es/config/bsentity/BsScheduledJob.java index 32ed472ba..9cea4581c 100644 --- a/src/main/java/org/codelibs/fess/es/config/bsentity/BsScheduledJob.java +++ b/src/main/java/org/codelibs/fess/es/config/bsentity/BsScheduledJob.java @@ -15,7 +15,7 @@ */ package org.codelibs.fess.es.config.bsentity; -import java.time.LocalDateTime; +import java.time.*; import java.util.HashMap; import java.util.Map; diff --git a/src/main/java/org/codelibs/fess/es/config/bsentity/BsSuggestBadWord.java b/src/main/java/org/codelibs/fess/es/config/bsentity/BsSuggestBadWord.java index 88eb2e4e4..8bad44227 100644 --- a/src/main/java/org/codelibs/fess/es/config/bsentity/BsSuggestBadWord.java +++ b/src/main/java/org/codelibs/fess/es/config/bsentity/BsSuggestBadWord.java @@ -15,7 +15,7 @@ */ package org.codelibs.fess.es.config.bsentity; -import java.time.LocalDateTime; +import java.time.*; import java.util.HashMap; import java.util.Map; diff --git a/src/main/java/org/codelibs/fess/es/config/bsentity/BsSuggestElevateWord.java b/src/main/java/org/codelibs/fess/es/config/bsentity/BsSuggestElevateWord.java index 541df6042..3f8972c08 100644 --- a/src/main/java/org/codelibs/fess/es/config/bsentity/BsSuggestElevateWord.java +++ b/src/main/java/org/codelibs/fess/es/config/bsentity/BsSuggestElevateWord.java @@ -15,7 +15,7 @@ */ package org.codelibs.fess.es.config.bsentity; -import java.time.LocalDateTime; +import java.time.*; import java.util.HashMap; import java.util.Map; diff --git a/src/main/java/org/codelibs/fess/es/config/bsentity/BsSuggestElevateWordToLabel.java b/src/main/java/org/codelibs/fess/es/config/bsentity/BsSuggestElevateWordToLabel.java index effc034c5..5f465b804 100644 --- a/src/main/java/org/codelibs/fess/es/config/bsentity/BsSuggestElevateWordToLabel.java +++ b/src/main/java/org/codelibs/fess/es/config/bsentity/BsSuggestElevateWordToLabel.java @@ -15,7 +15,7 @@ */ package org.codelibs.fess.es.config.bsentity; -import java.time.LocalDateTime; +import java.time.*; import java.util.HashMap; import java.util.Map; diff --git a/src/main/java/org/codelibs/fess/es/config/bsentity/BsWebAuthentication.java b/src/main/java/org/codelibs/fess/es/config/bsentity/BsWebAuthentication.java index ae1c0cc87..a36f0d671 100644 --- a/src/main/java/org/codelibs/fess/es/config/bsentity/BsWebAuthentication.java +++ b/src/main/java/org/codelibs/fess/es/config/bsentity/BsWebAuthentication.java @@ -15,7 +15,7 @@ */ package org.codelibs.fess.es.config.bsentity; -import java.time.LocalDateTime; +import java.time.*; import java.util.HashMap; import java.util.Map; diff --git a/src/main/java/org/codelibs/fess/es/config/bsentity/BsWebConfig.java b/src/main/java/org/codelibs/fess/es/config/bsentity/BsWebConfig.java index dc2a26cd3..571201822 100644 --- a/src/main/java/org/codelibs/fess/es/config/bsentity/BsWebConfig.java +++ b/src/main/java/org/codelibs/fess/es/config/bsentity/BsWebConfig.java @@ -15,7 +15,7 @@ */ package org.codelibs.fess.es.config.bsentity; -import java.time.LocalDateTime; +import java.time.*; import java.util.HashMap; import java.util.Map; diff --git a/src/main/java/org/codelibs/fess/es/config/bsentity/BsWebConfigToLabel.java b/src/main/java/org/codelibs/fess/es/config/bsentity/BsWebConfigToLabel.java index 0c826c8dc..78fa92234 100644 --- a/src/main/java/org/codelibs/fess/es/config/bsentity/BsWebConfigToLabel.java +++ b/src/main/java/org/codelibs/fess/es/config/bsentity/BsWebConfigToLabel.java @@ -15,7 +15,7 @@ */ package org.codelibs.fess.es.config.bsentity; -import java.time.LocalDateTime; +import java.time.*; import java.util.HashMap; import java.util.Map; diff --git a/src/main/java/org/codelibs/fess/es/config/bsentity/BsWebConfigToRole.java b/src/main/java/org/codelibs/fess/es/config/bsentity/BsWebConfigToRole.java index 064169ca5..61bc548b4 100644 --- a/src/main/java/org/codelibs/fess/es/config/bsentity/BsWebConfigToRole.java +++ b/src/main/java/org/codelibs/fess/es/config/bsentity/BsWebConfigToRole.java @@ -15,7 +15,7 @@ */ package org.codelibs.fess.es.config.bsentity; -import java.time.LocalDateTime; +import java.time.*; import java.util.HashMap; import java.util.Map; diff --git a/src/main/java/org/codelibs/fess/es/config/bsentity/dbmeta/BoostDocumentRuleDbm.java b/src/main/java/org/codelibs/fess/es/config/bsentity/dbmeta/BoostDocumentRuleDbm.java index eaa82c472..c026571ec 100644 --- a/src/main/java/org/codelibs/fess/es/config/bsentity/dbmeta/BoostDocumentRuleDbm.java +++ b/src/main/java/org/codelibs/fess/es/config/bsentity/dbmeta/BoostDocumentRuleDbm.java @@ -15,11 +15,12 @@ */ package org.codelibs.fess.es.config.bsentity.dbmeta; -import java.time.LocalDateTime; +import java.time.*; import java.util.List; import java.util.Map; import org.codelibs.fess.es.config.exentity.BoostDocumentRule; + import org.dbflute.Entity; import org.dbflute.dbmeta.AbstractDBMeta; import org.dbflute.dbmeta.info.ColumnInfo; @@ -79,20 +80,13 @@ public class BoostDocumentRuleDbm extends AbstractDBMeta { // --------------- protected final Map _epgMap = newHashMap(); { - setupEpg(_epgMap, et -> ((BoostDocumentRule) et).getBoostExpr(), - (et, vl) -> ((BoostDocumentRule) et).setBoostExpr(DfTypeUtil.toString(vl)), "boostExpr"); - setupEpg(_epgMap, et -> ((BoostDocumentRule) et).getCreatedBy(), - (et, vl) -> ((BoostDocumentRule) et).setCreatedBy(DfTypeUtil.toString(vl)), "createdBy"); - setupEpg(_epgMap, et -> ((BoostDocumentRule) et).getCreatedTime(), - (et, vl) -> ((BoostDocumentRule) et).setCreatedTime(DfTypeUtil.toLong(vl)), "createdTime"); - setupEpg(_epgMap, et -> ((BoostDocumentRule) et).getSortOrder(), - (et, vl) -> ((BoostDocumentRule) et).setSortOrder(DfTypeUtil.toInteger(vl)), "sortOrder"); - setupEpg(_epgMap, et -> ((BoostDocumentRule) et).getUpdatedBy(), - (et, vl) -> ((BoostDocumentRule) et).setUpdatedBy(DfTypeUtil.toString(vl)), "updatedBy"); - setupEpg(_epgMap, et -> ((BoostDocumentRule) et).getUpdatedTime(), - (et, vl) -> ((BoostDocumentRule) et).setUpdatedTime(DfTypeUtil.toLong(vl)), "updatedTime"); - setupEpg(_epgMap, et -> ((BoostDocumentRule) et).getUrlExpr(), - (et, vl) -> ((BoostDocumentRule) et).setUrlExpr(DfTypeUtil.toString(vl)), "urlExpr"); + setupEpg(_epgMap, et-> ((BoostDocumentRule)et).getBoostExpr(),(et,vl)->((BoostDocumentRule) et).setBoostExpr(DfTypeUtil.toString(vl)), "boostExpr"); + setupEpg(_epgMap, et-> ((BoostDocumentRule)et).getCreatedBy(),(et,vl)->((BoostDocumentRule) et).setCreatedBy(DfTypeUtil.toString(vl)), "createdBy"); + setupEpg(_epgMap, et-> ((BoostDocumentRule)et).getCreatedTime(),(et,vl)->((BoostDocumentRule) et).setCreatedTime(DfTypeUtil.toLong(vl)), "createdTime"); + setupEpg(_epgMap, et-> ((BoostDocumentRule)et).getSortOrder(),(et,vl)->((BoostDocumentRule) et).setSortOrder(DfTypeUtil.toInteger(vl)), "sortOrder"); + setupEpg(_epgMap, et-> ((BoostDocumentRule)et).getUpdatedBy(),(et,vl)->((BoostDocumentRule) et).setUpdatedBy(DfTypeUtil.toString(vl)), "updatedBy"); + setupEpg(_epgMap, et-> ((BoostDocumentRule)et).getUpdatedTime(),(et,vl)->((BoostDocumentRule) et).setUpdatedTime(DfTypeUtil.toLong(vl)), "updatedTime"); + setupEpg(_epgMap, et-> ((BoostDocumentRule)et).getUrlExpr(),(et,vl)->((BoostDocumentRule) et).setUrlExpr(DfTypeUtil.toString(vl)), "urlExpr"); } @Override @@ -106,71 +100,32 @@ public class BoostDocumentRuleDbm extends AbstractDBMeta { protected final String _tableDbName = "boost_document_rule"; protected final String _tableDispName = "boost_document_rule"; protected final String _tablePropertyName = "BoostDocumentRule"; - - public String getTableDbName() { - return _tableDbName; - } - + public String getTableDbName() { return _tableDbName; } @Override - public String getTableDispName() { - return _tableDispName; - } - + public String getTableDispName() { return _tableDispName; } @Override - public String getTablePropertyName() { - return _tablePropertyName; - } - + public String getTablePropertyName() { return _tablePropertyName; } @Override - public TableSqlName getTableSqlName() { - return null; - } + public TableSqlName getTableSqlName() { return null; } // =================================================================================== // Column Info // =========== - protected final ColumnInfo _columnBoostExpr = cci("boostExpr", "boostExpr", null, null, String.class, "boostExpr", null, false, false, - false, "String", 0, 0, null, false, null, null, null, null, null, false); - protected final ColumnInfo _columnCreatedBy = cci("createdBy", "createdBy", null, null, String.class, "createdBy", null, false, false, - false, "String", 0, 0, null, false, null, null, null, null, null, false); - protected final ColumnInfo _columnCreatedTime = cci("createdTime", "createdTime", null, null, Long.class, "createdTime", null, false, - false, false, "Long", 0, 0, null, false, null, null, null, null, null, false); - protected final ColumnInfo _columnSortOrder = cci("sortOrder", "sortOrder", null, null, Integer.class, "sortOrder", null, false, false, - false, "Integer", 0, 0, null, false, null, null, null, null, null, false); - protected final ColumnInfo _columnUpdatedBy = cci("updatedBy", "updatedBy", null, null, String.class, "updatedBy", null, false, false, - false, "String", 0, 0, null, false, null, null, null, null, null, false); - protected final ColumnInfo _columnUpdatedTime = cci("updatedTime", "updatedTime", null, null, Long.class, "updatedTime", null, false, - false, false, "Long", 0, 0, null, false, null, null, null, null, null, false); - protected final ColumnInfo _columnUrlExpr = cci("urlExpr", "urlExpr", null, null, String.class, "urlExpr", null, false, false, false, - "String", 0, 0, null, false, null, null, null, null, null, false); + protected final ColumnInfo _columnBoostExpr = cci("boostExpr", "boostExpr", null, null, String.class, "boostExpr", null, false, false, false, "String", 0, 0, null, false, null, null, null, null, null, false); + protected final ColumnInfo _columnCreatedBy = cci("createdBy", "createdBy", null, null, String.class, "createdBy", null, false, false, false, "String", 0, 0, null, false, null, null, null, null, null, false); + protected final ColumnInfo _columnCreatedTime = cci("createdTime", "createdTime", null, null, Long.class, "createdTime", null, false, false, false, "Long", 0, 0, null, false, null, null, null, null, null, false); + protected final ColumnInfo _columnSortOrder = cci("sortOrder", "sortOrder", null, null, Integer.class, "sortOrder", null, false, false, false, "Integer", 0, 0, null, false, null, null, null, null, null, false); + protected final ColumnInfo _columnUpdatedBy = cci("updatedBy", "updatedBy", null, null, String.class, "updatedBy", null, false, false, false, "String", 0, 0, null, false, null, null, null, null, null, false); + protected final ColumnInfo _columnUpdatedTime = cci("updatedTime", "updatedTime", null, null, Long.class, "updatedTime", null, false, false, false, "Long", 0, 0, null, false, null, null, null, null, null, false); + protected final ColumnInfo _columnUrlExpr = cci("urlExpr", "urlExpr", null, null, String.class, "urlExpr", null, false, false, false, "String", 0, 0, null, false, null, null, null, null, null, false); - public ColumnInfo columnBoostExpr() { - return _columnBoostExpr; - } - - public ColumnInfo columnCreatedBy() { - return _columnCreatedBy; - } - - public ColumnInfo columnCreatedTime() { - return _columnCreatedTime; - } - - public ColumnInfo columnSortOrder() { - return _columnSortOrder; - } - - public ColumnInfo columnUpdatedBy() { - return _columnUpdatedBy; - } - - public ColumnInfo columnUpdatedTime() { - return _columnUpdatedTime; - } - - public ColumnInfo columnUrlExpr() { - return _columnUrlExpr; - } + public ColumnInfo columnBoostExpr() { return _columnBoostExpr; } + public ColumnInfo columnCreatedBy() { return _columnCreatedBy; } + public ColumnInfo columnCreatedTime() { return _columnCreatedTime; } + public ColumnInfo columnSortOrder() { return _columnSortOrder; } + public ColumnInfo columnUpdatedBy() { return _columnUpdatedBy; } + public ColumnInfo columnUpdatedTime() { return _columnUpdatedTime; } + public ColumnInfo columnUrlExpr() { return _columnUrlExpr; } protected List ccil() { List ls = newArrayList(); @@ -257,3 +212,4 @@ public class BoostDocumentRuleDbm extends AbstractDBMeta { return null; } } + diff --git a/src/main/java/org/codelibs/fess/es/config/bsentity/dbmeta/CrawlingSessionDbm.java b/src/main/java/org/codelibs/fess/es/config/bsentity/dbmeta/CrawlingInfoDbm.java similarity index 72% rename from src/main/java/org/codelibs/fess/es/config/bsentity/dbmeta/CrawlingSessionDbm.java rename to src/main/java/org/codelibs/fess/es/config/bsentity/dbmeta/CrawlingInfoDbm.java index 07aa67cfc..3488c2203 100644 --- a/src/main/java/org/codelibs/fess/es/config/bsentity/dbmeta/CrawlingSessionDbm.java +++ b/src/main/java/org/codelibs/fess/es/config/bsentity/dbmeta/CrawlingInfoDbm.java @@ -15,11 +15,12 @@ */ package org.codelibs.fess.es.config.bsentity.dbmeta; -import java.time.LocalDateTime; +import java.time.*; import java.util.List; import java.util.Map; -import org.codelibs.fess.es.config.exentity.CrawlingSession; +import org.codelibs.fess.es.config.exentity.CrawlingInfo; + import org.dbflute.Entity; import org.dbflute.dbmeta.AbstractDBMeta; import org.dbflute.dbmeta.info.ColumnInfo; @@ -32,19 +33,19 @@ import org.dbflute.util.DfTypeUtil; /** * @author ESFlute (using FreeGen) */ -public class CrawlingSessionDbm extends AbstractDBMeta { +public class CrawlingInfoDbm extends AbstractDBMeta { protected static final Class suppressUnusedImportLocalDateTime = LocalDateTime.class; // =================================================================================== // Singleton // ========= - private static final CrawlingSessionDbm _instance = new CrawlingSessionDbm(); + private static final CrawlingInfoDbm _instance = new CrawlingInfoDbm(); - private CrawlingSessionDbm() { + private CrawlingInfoDbm() { } - public static CrawlingSessionDbm getInstance() { + public static CrawlingInfoDbm getInstance() { return _instance; } @@ -79,14 +80,10 @@ public class CrawlingSessionDbm extends AbstractDBMeta { // --------------- protected final Map _epgMap = newHashMap(); { - setupEpg(_epgMap, et -> ((CrawlingSession) et).getCreatedTime(), - (et, vl) -> ((CrawlingSession) et).setCreatedTime(DfTypeUtil.toLong(vl)), "createdTime"); - setupEpg(_epgMap, et -> ((CrawlingSession) et).getExpiredTime(), - (et, vl) -> ((CrawlingSession) et).setExpiredTime(DfTypeUtil.toLong(vl)), "expiredTime"); - setupEpg(_epgMap, et -> ((CrawlingSession) et).getName(), (et, vl) -> ((CrawlingSession) et).setName(DfTypeUtil.toString(vl)), - "name"); - setupEpg(_epgMap, et -> ((CrawlingSession) et).getSessionId(), - (et, vl) -> ((CrawlingSession) et).setSessionId(DfTypeUtil.toString(vl)), "sessionId"); + setupEpg(_epgMap, et-> ((CrawlingInfo)et).getCreatedTime(),(et,vl)->((CrawlingInfo) et).setCreatedTime(DfTypeUtil.toLong(vl)), "createdTime"); + setupEpg(_epgMap, et-> ((CrawlingInfo)et).getExpiredTime(),(et,vl)->((CrawlingInfo) et).setExpiredTime(DfTypeUtil.toLong(vl)), "expiredTime"); + setupEpg(_epgMap, et-> ((CrawlingInfo)et).getName(),(et,vl)->((CrawlingInfo) et).setName(DfTypeUtil.toString(vl)), "name"); + setupEpg(_epgMap, et-> ((CrawlingInfo)et).getSessionId(),(et,vl)->((CrawlingInfo) et).setSessionId(DfTypeUtil.toString(vl)), "sessionId"); } @Override @@ -97,56 +94,29 @@ public class CrawlingSessionDbm extends AbstractDBMeta { // =================================================================================== // Table Info // ========== - protected final String _tableDbName = "crawling_session"; - protected final String _tableDispName = "crawling_session"; - protected final String _tablePropertyName = "CrawlingSession"; - - public String getTableDbName() { - return _tableDbName; - } - + protected final String _tableDbName = "crawling_info"; + protected final String _tableDispName = "crawling_info"; + protected final String _tablePropertyName = "CrawlingInfo"; + public String getTableDbName() { return _tableDbName; } @Override - public String getTableDispName() { - return _tableDispName; - } - + public String getTableDispName() { return _tableDispName; } @Override - public String getTablePropertyName() { - return _tablePropertyName; - } - + public String getTablePropertyName() { return _tablePropertyName; } @Override - public TableSqlName getTableSqlName() { - return null; - } + public TableSqlName getTableSqlName() { return null; } // =================================================================================== // Column Info // =========== - protected final ColumnInfo _columnCreatedTime = cci("createdTime", "createdTime", null, null, Long.class, "createdTime", null, false, - false, false, "Long", 0, 0, null, false, null, null, null, null, null, false); - protected final ColumnInfo _columnExpiredTime = cci("expiredTime", "expiredTime", null, null, Long.class, "expiredTime", null, false, - false, false, "Long", 0, 0, null, false, null, null, null, null, null, false); - protected final ColumnInfo _columnName = cci("name", "name", null, null, String.class, "name", null, false, false, false, "String", 0, - 0, null, false, null, null, null, null, null, false); - protected final ColumnInfo _columnSessionId = cci("sessionId", "sessionId", null, null, String.class, "sessionId", null, false, false, - false, "String", 0, 0, null, false, null, null, null, null, null, false); + protected final ColumnInfo _columnCreatedTime = cci("createdTime", "createdTime", null, null, Long.class, "createdTime", null, false, false, false, "Long", 0, 0, null, false, null, null, null, null, null, false); + protected final ColumnInfo _columnExpiredTime = cci("expiredTime", "expiredTime", null, null, Long.class, "expiredTime", null, false, false, false, "Long", 0, 0, null, false, null, null, null, null, null, false); + protected final ColumnInfo _columnName = cci("name", "name", null, null, String.class, "name", null, false, false, false, "String", 0, 0, null, false, null, null, null, null, null, false); + protected final ColumnInfo _columnSessionId = cci("sessionId", "sessionId", null, null, String.class, "sessionId", null, false, false, false, "String", 0, 0, null, false, null, null, null, null, null, false); - public ColumnInfo columnCreatedTime() { - return _columnCreatedTime; - } - - public ColumnInfo columnExpiredTime() { - return _columnExpiredTime; - } - - public ColumnInfo columnName() { - return _columnName; - } - - public ColumnInfo columnSessionId() { - return _columnSessionId; - } + public ColumnInfo columnCreatedTime() { return _columnCreatedTime; } + public ColumnInfo columnExpiredTime() { return _columnExpiredTime; } + public ColumnInfo columnName() { return _columnName; } + public ColumnInfo columnSessionId() { return _columnSessionId; } protected List ccil() { List ls = newArrayList(); @@ -180,17 +150,17 @@ public class CrawlingSessionDbm extends AbstractDBMeta { // ========= @Override public String getEntityTypeName() { - return "org.codelibs.fess.es.config.exentity.CrawlingSession"; + return "org.codelibs.fess.es.config.exentity.CrawlingInfo"; } @Override public String getConditionBeanTypeName() { - return "org.codelibs.fess.es.config.cbean.CrawlingSessionCB"; + return "org.codelibs.fess.es.config.cbean.CrawlingInfoCB"; } @Override public String getBehaviorTypeName() { - return "org.codelibs.fess.es.config.exbhv.CrawlingSessionBhv"; + return "org.codelibs.fess.es.config.exbhv.CrawlingInfoBhv"; } // =================================================================================== @@ -198,7 +168,7 @@ public class CrawlingSessionDbm extends AbstractDBMeta { // =========== @Override public Class getEntityType() { - return CrawlingSession.class; + return CrawlingInfo.class; } // =================================================================================== @@ -206,7 +176,7 @@ public class CrawlingSessionDbm extends AbstractDBMeta { // =============== @Override public Entity newEntity() { - return new CrawlingSession(); + return new CrawlingInfo(); } // =================================================================================== @@ -230,3 +200,4 @@ public class CrawlingSessionDbm extends AbstractDBMeta { return null; } } + diff --git a/src/main/java/org/codelibs/fess/es/config/bsentity/dbmeta/CrawlingSessionInfoDbm.java b/src/main/java/org/codelibs/fess/es/config/bsentity/dbmeta/CrawlingInfoParamDbm.java similarity index 69% rename from src/main/java/org/codelibs/fess/es/config/bsentity/dbmeta/CrawlingSessionInfoDbm.java rename to src/main/java/org/codelibs/fess/es/config/bsentity/dbmeta/CrawlingInfoParamDbm.java index 162097288..3fb68eafc 100644 --- a/src/main/java/org/codelibs/fess/es/config/bsentity/dbmeta/CrawlingSessionInfoDbm.java +++ b/src/main/java/org/codelibs/fess/es/config/bsentity/dbmeta/CrawlingInfoParamDbm.java @@ -15,11 +15,12 @@ */ package org.codelibs.fess.es.config.bsentity.dbmeta; -import java.time.LocalDateTime; +import java.time.*; import java.util.List; import java.util.Map; -import org.codelibs.fess.es.config.exentity.CrawlingSessionInfo; +import org.codelibs.fess.es.config.exentity.CrawlingInfoParam; + import org.dbflute.Entity; import org.dbflute.dbmeta.AbstractDBMeta; import org.dbflute.dbmeta.info.ColumnInfo; @@ -32,19 +33,19 @@ import org.dbflute.util.DfTypeUtil; /** * @author ESFlute (using FreeGen) */ -public class CrawlingSessionInfoDbm extends AbstractDBMeta { +public class CrawlingInfoParamDbm extends AbstractDBMeta { protected static final Class suppressUnusedImportLocalDateTime = LocalDateTime.class; // =================================================================================== // Singleton // ========= - private static final CrawlingSessionInfoDbm _instance = new CrawlingSessionInfoDbm(); + private static final CrawlingInfoParamDbm _instance = new CrawlingInfoParamDbm(); - private CrawlingSessionInfoDbm() { + private CrawlingInfoParamDbm() { } - public static CrawlingSessionInfoDbm getInstance() { + public static CrawlingInfoParamDbm getInstance() { return _instance; } @@ -79,14 +80,10 @@ public class CrawlingSessionInfoDbm extends AbstractDBMeta { // --------------- protected final Map _epgMap = newHashMap(); { - setupEpg(_epgMap, et -> ((CrawlingSessionInfo) et).getCrawlingSessionId(), - (et, vl) -> ((CrawlingSessionInfo) et).setCrawlingSessionId(DfTypeUtil.toString(vl)), "crawlingSessionId"); - setupEpg(_epgMap, et -> ((CrawlingSessionInfo) et).getCreatedTime(), - (et, vl) -> ((CrawlingSessionInfo) et).setCreatedTime(DfTypeUtil.toLong(vl)), "createdTime"); - setupEpg(_epgMap, et -> ((CrawlingSessionInfo) et).getKey(), - (et, vl) -> ((CrawlingSessionInfo) et).setKey(DfTypeUtil.toString(vl)), "key"); - setupEpg(_epgMap, et -> ((CrawlingSessionInfo) et).getValue(), - (et, vl) -> ((CrawlingSessionInfo) et).setValue(DfTypeUtil.toString(vl)), "value"); + setupEpg(_epgMap, et-> ((CrawlingInfoParam)et).getCrawlingInfoId(),(et,vl)->((CrawlingInfoParam) et).setCrawlingInfoId(DfTypeUtil.toString(vl)), "crawlingInfoId"); + setupEpg(_epgMap, et-> ((CrawlingInfoParam)et).getCreatedTime(),(et,vl)->((CrawlingInfoParam) et).setCreatedTime(DfTypeUtil.toLong(vl)), "createdTime"); + setupEpg(_epgMap, et-> ((CrawlingInfoParam)et).getKey(),(et,vl)->((CrawlingInfoParam) et).setKey(DfTypeUtil.toString(vl)), "key"); + setupEpg(_epgMap, et-> ((CrawlingInfoParam)et).getValue(),(et,vl)->((CrawlingInfoParam) et).setValue(DfTypeUtil.toString(vl)), "value"); } @Override @@ -97,60 +94,33 @@ public class CrawlingSessionInfoDbm extends AbstractDBMeta { // =================================================================================== // Table Info // ========== - protected final String _tableDbName = "crawling_session_info"; - protected final String _tableDispName = "crawling_session_info"; - protected final String _tablePropertyName = "CrawlingSessionInfo"; - - public String getTableDbName() { - return _tableDbName; - } - + protected final String _tableDbName = "crawling_info_param"; + protected final String _tableDispName = "crawling_info_param"; + protected final String _tablePropertyName = "CrawlingInfoParam"; + public String getTableDbName() { return _tableDbName; } @Override - public String getTableDispName() { - return _tableDispName; - } - + public String getTableDispName() { return _tableDispName; } @Override - public String getTablePropertyName() { - return _tablePropertyName; - } - + public String getTablePropertyName() { return _tablePropertyName; } @Override - public TableSqlName getTableSqlName() { - return null; - } + public TableSqlName getTableSqlName() { return null; } // =================================================================================== // Column Info // =========== - protected final ColumnInfo _columnCrawlingSessionId = cci("crawlingSessionId", "crawlingSessionId", null, null, String.class, - "crawlingSessionId", null, false, false, false, "String", 0, 0, null, false, null, null, null, null, null, false); - protected final ColumnInfo _columnCreatedTime = cci("createdTime", "createdTime", null, null, Long.class, "createdTime", null, false, - false, false, "Long", 0, 0, null, false, null, null, null, null, null, false); - protected final ColumnInfo _columnKey = cci("key", "key", null, null, String.class, "key", null, false, false, false, "String", 0, 0, - null, false, null, null, null, null, null, false); - protected final ColumnInfo _columnValue = cci("value", "value", null, null, String.class, "value", null, false, false, false, "String", - 0, 0, null, false, null, null, null, null, null, false); + protected final ColumnInfo _columnCrawlingInfoId = cci("crawlingInfoId", "crawlingInfoId", null, null, String.class, "crawlingInfoId", null, false, false, false, "String", 0, 0, null, false, null, null, null, null, null, false); + protected final ColumnInfo _columnCreatedTime = cci("createdTime", "createdTime", null, null, Long.class, "createdTime", null, false, false, false, "Long", 0, 0, null, false, null, null, null, null, null, false); + protected final ColumnInfo _columnKey = cci("key", "key", null, null, String.class, "key", null, false, false, false, "String", 0, 0, null, false, null, null, null, null, null, false); + protected final ColumnInfo _columnValue = cci("value", "value", null, null, String.class, "value", null, false, false, false, "String", 0, 0, null, false, null, null, null, null, null, false); - public ColumnInfo columnCrawlingSessionId() { - return _columnCrawlingSessionId; - } - - public ColumnInfo columnCreatedTime() { - return _columnCreatedTime; - } - - public ColumnInfo columnKey() { - return _columnKey; - } - - public ColumnInfo columnValue() { - return _columnValue; - } + public ColumnInfo columnCrawlingInfoId() { return _columnCrawlingInfoId; } + public ColumnInfo columnCreatedTime() { return _columnCreatedTime; } + public ColumnInfo columnKey() { return _columnKey; } + public ColumnInfo columnValue() { return _columnValue; } protected List ccil() { List ls = newArrayList(); - ls.add(columnCrawlingSessionId()); + ls.add(columnCrawlingInfoId()); ls.add(columnCreatedTime()); ls.add(columnKey()); ls.add(columnValue()); @@ -180,17 +150,17 @@ public class CrawlingSessionInfoDbm extends AbstractDBMeta { // ========= @Override public String getEntityTypeName() { - return "org.codelibs.fess.es.config.exentity.CrawlingSessionInfo"; + return "org.codelibs.fess.es.config.exentity.CrawlingInfoParam"; } @Override public String getConditionBeanTypeName() { - return "org.codelibs.fess.es.config.cbean.CrawlingSessionInfoCB"; + return "org.codelibs.fess.es.config.cbean.CrawlingInfoParamCB"; } @Override public String getBehaviorTypeName() { - return "org.codelibs.fess.es.config.exbhv.CrawlingSessionInfoBhv"; + return "org.codelibs.fess.es.config.exbhv.CrawlingInfoParamBhv"; } // =================================================================================== @@ -198,7 +168,7 @@ public class CrawlingSessionInfoDbm extends AbstractDBMeta { // =========== @Override public Class getEntityType() { - return CrawlingSessionInfo.class; + return CrawlingInfoParam.class; } // =================================================================================== @@ -206,7 +176,7 @@ public class CrawlingSessionInfoDbm extends AbstractDBMeta { // =============== @Override public Entity newEntity() { - return new CrawlingSessionInfo(); + return new CrawlingInfoParam(); } // =================================================================================== @@ -230,3 +200,4 @@ public class CrawlingSessionInfoDbm extends AbstractDBMeta { return null; } } + diff --git a/src/main/java/org/codelibs/fess/es/config/bsentity/dbmeta/DataConfigDbm.java b/src/main/java/org/codelibs/fess/es/config/bsentity/dbmeta/DataConfigDbm.java index 8e890e5cf..913ff9282 100644 --- a/src/main/java/org/codelibs/fess/es/config/bsentity/dbmeta/DataConfigDbm.java +++ b/src/main/java/org/codelibs/fess/es/config/bsentity/dbmeta/DataConfigDbm.java @@ -15,11 +15,12 @@ */ package org.codelibs.fess.es.config.bsentity.dbmeta; -import java.time.LocalDateTime; +import java.time.*; import java.util.List; import java.util.Map; import org.codelibs.fess.es.config.exentity.DataConfig; + import org.dbflute.Entity; import org.dbflute.dbmeta.AbstractDBMeta; import org.dbflute.dbmeta.info.ColumnInfo; @@ -79,26 +80,17 @@ public class DataConfigDbm extends AbstractDBMeta { // --------------- protected final Map _epgMap = newHashMap(); { - setupEpg(_epgMap, et -> ((DataConfig) et).getAvailable(), (et, vl) -> ((DataConfig) et).setAvailable(DfTypeUtil.toBoolean(vl)), - "available"); - setupEpg(_epgMap, et -> ((DataConfig) et).getBoost(), (et, vl) -> ((DataConfig) et).setBoost(DfTypeUtil.toFloat(vl)), "boost"); - setupEpg(_epgMap, et -> ((DataConfig) et).getCreatedBy(), (et, vl) -> ((DataConfig) et).setCreatedBy(DfTypeUtil.toString(vl)), - "createdBy"); - setupEpg(_epgMap, et -> ((DataConfig) et).getCreatedTime(), (et, vl) -> ((DataConfig) et).setCreatedTime(DfTypeUtil.toLong(vl)), - "createdTime"); - setupEpg(_epgMap, et -> ((DataConfig) et).getHandlerName(), (et, vl) -> ((DataConfig) et).setHandlerName(DfTypeUtil.toString(vl)), - "handlerName"); - setupEpg(_epgMap, et -> ((DataConfig) et).getHandlerParameter(), - (et, vl) -> ((DataConfig) et).setHandlerParameter(DfTypeUtil.toString(vl)), "handlerParameter"); - setupEpg(_epgMap, et -> ((DataConfig) et).getHandlerScript(), - (et, vl) -> ((DataConfig) et).setHandlerScript(DfTypeUtil.toString(vl)), "handlerScript"); - setupEpg(_epgMap, et -> ((DataConfig) et).getName(), (et, vl) -> ((DataConfig) et).setName(DfTypeUtil.toString(vl)), "name"); - setupEpg(_epgMap, et -> ((DataConfig) et).getSortOrder(), (et, vl) -> ((DataConfig) et).setSortOrder(DfTypeUtil.toInteger(vl)), - "sortOrder"); - setupEpg(_epgMap, et -> ((DataConfig) et).getUpdatedBy(), (et, vl) -> ((DataConfig) et).setUpdatedBy(DfTypeUtil.toString(vl)), - "updatedBy"); - setupEpg(_epgMap, et -> ((DataConfig) et).getUpdatedTime(), (et, vl) -> ((DataConfig) et).setUpdatedTime(DfTypeUtil.toLong(vl)), - "updatedTime"); + setupEpg(_epgMap, et-> ((DataConfig)et).getAvailable(),(et,vl)->((DataConfig) et).setAvailable(DfTypeUtil.toBoolean(vl)), "available"); + setupEpg(_epgMap, et-> ((DataConfig)et).getBoost(),(et,vl)->((DataConfig) et).setBoost(DfTypeUtil.toFloat(vl)), "boost"); + setupEpg(_epgMap, et-> ((DataConfig)et).getCreatedBy(),(et,vl)->((DataConfig) et).setCreatedBy(DfTypeUtil.toString(vl)), "createdBy"); + setupEpg(_epgMap, et-> ((DataConfig)et).getCreatedTime(),(et,vl)->((DataConfig) et).setCreatedTime(DfTypeUtil.toLong(vl)), "createdTime"); + setupEpg(_epgMap, et-> ((DataConfig)et).getHandlerName(),(et,vl)->((DataConfig) et).setHandlerName(DfTypeUtil.toString(vl)), "handlerName"); + setupEpg(_epgMap, et-> ((DataConfig)et).getHandlerParameter(),(et,vl)->((DataConfig) et).setHandlerParameter(DfTypeUtil.toString(vl)), "handlerParameter"); + setupEpg(_epgMap, et-> ((DataConfig)et).getHandlerScript(),(et,vl)->((DataConfig) et).setHandlerScript(DfTypeUtil.toString(vl)), "handlerScript"); + setupEpg(_epgMap, et-> ((DataConfig)et).getName(),(et,vl)->((DataConfig) et).setName(DfTypeUtil.toString(vl)), "name"); + setupEpg(_epgMap, et-> ((DataConfig)et).getSortOrder(),(et,vl)->((DataConfig) et).setSortOrder(DfTypeUtil.toInteger(vl)), "sortOrder"); + setupEpg(_epgMap, et-> ((DataConfig)et).getUpdatedBy(),(et,vl)->((DataConfig) et).setUpdatedBy(DfTypeUtil.toString(vl)), "updatedBy"); + setupEpg(_epgMap, et-> ((DataConfig)et).getUpdatedTime(),(et,vl)->((DataConfig) et).setUpdatedTime(DfTypeUtil.toLong(vl)), "updatedTime"); } @Override @@ -112,95 +104,40 @@ public class DataConfigDbm extends AbstractDBMeta { protected final String _tableDbName = "data_config"; protected final String _tableDispName = "data_config"; protected final String _tablePropertyName = "DataConfig"; - - public String getTableDbName() { - return _tableDbName; - } - + public String getTableDbName() { return _tableDbName; } @Override - public String getTableDispName() { - return _tableDispName; - } - + public String getTableDispName() { return _tableDispName; } @Override - public String getTablePropertyName() { - return _tablePropertyName; - } - + public String getTablePropertyName() { return _tablePropertyName; } @Override - public TableSqlName getTableSqlName() { - return null; - } + public TableSqlName getTableSqlName() { return null; } // =================================================================================== // Column Info // =========== - protected final ColumnInfo _columnAvailable = cci("available", "available", null, null, Boolean.class, "available", null, false, false, - false, "Boolean", 0, 0, null, false, null, null, null, null, null, false); - protected final ColumnInfo _columnBoost = cci("boost", "boost", null, null, Float.class, "boost", null, false, false, false, "Float", - 0, 0, null, false, null, null, null, null, null, false); - protected final ColumnInfo _columnCreatedBy = cci("createdBy", "createdBy", null, null, String.class, "createdBy", null, false, false, - false, "String", 0, 0, null, false, null, null, null, null, null, false); - protected final ColumnInfo _columnCreatedTime = cci("createdTime", "createdTime", null, null, Long.class, "createdTime", null, false, - false, false, "Long", 0, 0, null, false, null, null, null, null, null, false); - protected final ColumnInfo _columnHandlerName = cci("handlerName", "handlerName", null, null, String.class, "handlerName", null, false, - false, false, "String", 0, 0, null, false, null, null, null, null, null, false); - protected final ColumnInfo _columnHandlerParameter = cci("handlerParameter", "handlerParameter", null, null, String.class, - "handlerParameter", null, false, false, false, "String", 0, 0, null, false, null, null, null, null, null, false); - protected final ColumnInfo _columnHandlerScript = cci("handlerScript", "handlerScript", null, null, String.class, "handlerScript", - null, false, false, false, "String", 0, 0, null, false, null, null, null, null, null, false); - protected final ColumnInfo _columnName = cci("name", "name", null, null, String.class, "name", null, false, false, false, "String", 0, - 0, null, false, null, null, null, null, null, false); - protected final ColumnInfo _columnSortOrder = cci("sortOrder", "sortOrder", null, null, Integer.class, "sortOrder", null, false, false, - false, "Integer", 0, 0, null, false, null, null, null, null, null, false); - protected final ColumnInfo _columnUpdatedBy = cci("updatedBy", "updatedBy", null, null, String.class, "updatedBy", null, false, false, - false, "String", 0, 0, null, false, null, null, null, null, null, false); - protected final ColumnInfo _columnUpdatedTime = cci("updatedTime", "updatedTime", null, null, Long.class, "updatedTime", null, false, - false, false, "Long", 0, 0, null, false, null, null, null, null, null, false); + protected final ColumnInfo _columnAvailable = cci("available", "available", null, null, Boolean.class, "available", null, false, false, false, "Boolean", 0, 0, null, false, null, null, null, null, null, false); + protected final ColumnInfo _columnBoost = cci("boost", "boost", null, null, Float.class, "boost", null, false, false, false, "Float", 0, 0, null, false, null, null, null, null, null, false); + protected final ColumnInfo _columnCreatedBy = cci("createdBy", "createdBy", null, null, String.class, "createdBy", null, false, false, false, "String", 0, 0, null, false, null, null, null, null, null, false); + protected final ColumnInfo _columnCreatedTime = cci("createdTime", "createdTime", null, null, Long.class, "createdTime", null, false, false, false, "Long", 0, 0, null, false, null, null, null, null, null, false); + protected final ColumnInfo _columnHandlerName = cci("handlerName", "handlerName", null, null, String.class, "handlerName", null, false, false, false, "String", 0, 0, null, false, null, null, null, null, null, false); + protected final ColumnInfo _columnHandlerParameter = cci("handlerParameter", "handlerParameter", null, null, String.class, "handlerParameter", null, false, false, false, "String", 0, 0, null, false, null, null, null, null, null, false); + protected final ColumnInfo _columnHandlerScript = cci("handlerScript", "handlerScript", null, null, String.class, "handlerScript", null, false, false, false, "String", 0, 0, null, false, null, null, null, null, null, false); + protected final ColumnInfo _columnName = cci("name", "name", null, null, String.class, "name", null, false, false, false, "String", 0, 0, null, false, null, null, null, null, null, false); + protected final ColumnInfo _columnSortOrder = cci("sortOrder", "sortOrder", null, null, Integer.class, "sortOrder", null, false, false, false, "Integer", 0, 0, null, false, null, null, null, null, null, false); + protected final ColumnInfo _columnUpdatedBy = cci("updatedBy", "updatedBy", null, null, String.class, "updatedBy", null, false, false, false, "String", 0, 0, null, false, null, null, null, null, null, false); + protected final ColumnInfo _columnUpdatedTime = cci("updatedTime", "updatedTime", null, null, Long.class, "updatedTime", null, false, false, false, "Long", 0, 0, null, false, null, null, null, null, null, false); - public ColumnInfo columnAvailable() { - return _columnAvailable; - } - - public ColumnInfo columnBoost() { - return _columnBoost; - } - - public ColumnInfo columnCreatedBy() { - return _columnCreatedBy; - } - - public ColumnInfo columnCreatedTime() { - return _columnCreatedTime; - } - - public ColumnInfo columnHandlerName() { - return _columnHandlerName; - } - - public ColumnInfo columnHandlerParameter() { - return _columnHandlerParameter; - } - - public ColumnInfo columnHandlerScript() { - return _columnHandlerScript; - } - - public ColumnInfo columnName() { - return _columnName; - } - - public ColumnInfo columnSortOrder() { - return _columnSortOrder; - } - - public ColumnInfo columnUpdatedBy() { - return _columnUpdatedBy; - } - - public ColumnInfo columnUpdatedTime() { - return _columnUpdatedTime; - } + public ColumnInfo columnAvailable() { return _columnAvailable; } + public ColumnInfo columnBoost() { return _columnBoost; } + public ColumnInfo columnCreatedBy() { return _columnCreatedBy; } + public ColumnInfo columnCreatedTime() { return _columnCreatedTime; } + public ColumnInfo columnHandlerName() { return _columnHandlerName; } + public ColumnInfo columnHandlerParameter() { return _columnHandlerParameter; } + public ColumnInfo columnHandlerScript() { return _columnHandlerScript; } + public ColumnInfo columnName() { return _columnName; } + public ColumnInfo columnSortOrder() { return _columnSortOrder; } + public ColumnInfo columnUpdatedBy() { return _columnUpdatedBy; } + public ColumnInfo columnUpdatedTime() { return _columnUpdatedTime; } protected List ccil() { List ls = newArrayList(); @@ -291,3 +228,4 @@ public class DataConfigDbm extends AbstractDBMeta { return null; } } + diff --git a/src/main/java/org/codelibs/fess/es/config/bsentity/dbmeta/DataConfigToLabelDbm.java b/src/main/java/org/codelibs/fess/es/config/bsentity/dbmeta/DataConfigToLabelDbm.java index 1663b8f96..4d72ad173 100644 --- a/src/main/java/org/codelibs/fess/es/config/bsentity/dbmeta/DataConfigToLabelDbm.java +++ b/src/main/java/org/codelibs/fess/es/config/bsentity/dbmeta/DataConfigToLabelDbm.java @@ -15,11 +15,12 @@ */ package org.codelibs.fess.es.config.bsentity.dbmeta; -import java.time.LocalDateTime; +import java.time.*; import java.util.List; import java.util.Map; import org.codelibs.fess.es.config.exentity.DataConfigToLabel; + import org.dbflute.Entity; import org.dbflute.dbmeta.AbstractDBMeta; import org.dbflute.dbmeta.info.ColumnInfo; @@ -79,10 +80,8 @@ public class DataConfigToLabelDbm extends AbstractDBMeta { // --------------- protected final Map _epgMap = newHashMap(); { - setupEpg(_epgMap, et -> ((DataConfigToLabel) et).getDataConfigId(), - (et, vl) -> ((DataConfigToLabel) et).setDataConfigId(DfTypeUtil.toString(vl)), "dataConfigId"); - setupEpg(_epgMap, et -> ((DataConfigToLabel) et).getLabelTypeId(), - (et, vl) -> ((DataConfigToLabel) et).setLabelTypeId(DfTypeUtil.toString(vl)), "labelTypeId"); + setupEpg(_epgMap, et-> ((DataConfigToLabel)et).getDataConfigId(),(et,vl)->((DataConfigToLabel) et).setDataConfigId(DfTypeUtil.toString(vl)), "dataConfigId"); + setupEpg(_epgMap, et-> ((DataConfigToLabel)et).getLabelTypeId(),(et,vl)->((DataConfigToLabel) et).setLabelTypeId(DfTypeUtil.toString(vl)), "labelTypeId"); } @Override @@ -96,41 +95,22 @@ public class DataConfigToLabelDbm extends AbstractDBMeta { protected final String _tableDbName = "data_config_to_label"; protected final String _tableDispName = "data_config_to_label"; protected final String _tablePropertyName = "DataConfigToLabel"; - - public String getTableDbName() { - return _tableDbName; - } - + public String getTableDbName() { return _tableDbName; } @Override - public String getTableDispName() { - return _tableDispName; - } - + public String getTableDispName() { return _tableDispName; } @Override - public String getTablePropertyName() { - return _tablePropertyName; - } - + public String getTablePropertyName() { return _tablePropertyName; } @Override - public TableSqlName getTableSqlName() { - return null; - } + public TableSqlName getTableSqlName() { return null; } // =================================================================================== // Column Info // =========== - protected final ColumnInfo _columnDataConfigId = cci("dataConfigId", "dataConfigId", null, null, String.class, "dataConfigId", null, - false, false, false, "String", 0, 0, null, false, null, null, null, null, null, false); - protected final ColumnInfo _columnLabelTypeId = cci("labelTypeId", "labelTypeId", null, null, String.class, "labelTypeId", null, false, - false, false, "String", 0, 0, null, false, null, null, null, null, null, false); + protected final ColumnInfo _columnDataConfigId = cci("dataConfigId", "dataConfigId", null, null, String.class, "dataConfigId", null, false, false, false, "String", 0, 0, null, false, null, null, null, null, null, false); + protected final ColumnInfo _columnLabelTypeId = cci("labelTypeId", "labelTypeId", null, null, String.class, "labelTypeId", null, false, false, false, "String", 0, 0, null, false, null, null, null, null, null, false); - public ColumnInfo columnDataConfigId() { - return _columnDataConfigId; - } - - public ColumnInfo columnLabelTypeId() { - return _columnLabelTypeId; - } + public ColumnInfo columnDataConfigId() { return _columnDataConfigId; } + public ColumnInfo columnLabelTypeId() { return _columnLabelTypeId; } protected List ccil() { List ls = newArrayList(); @@ -212,3 +192,4 @@ public class DataConfigToLabelDbm extends AbstractDBMeta { return null; } } + diff --git a/src/main/java/org/codelibs/fess/es/config/bsentity/dbmeta/DataConfigToRoleDbm.java b/src/main/java/org/codelibs/fess/es/config/bsentity/dbmeta/DataConfigToRoleDbm.java index f9308cea9..d80d4698f 100644 --- a/src/main/java/org/codelibs/fess/es/config/bsentity/dbmeta/DataConfigToRoleDbm.java +++ b/src/main/java/org/codelibs/fess/es/config/bsentity/dbmeta/DataConfigToRoleDbm.java @@ -15,11 +15,12 @@ */ package org.codelibs.fess.es.config.bsentity.dbmeta; -import java.time.LocalDateTime; +import java.time.*; import java.util.List; import java.util.Map; import org.codelibs.fess.es.config.exentity.DataConfigToRole; + import org.dbflute.Entity; import org.dbflute.dbmeta.AbstractDBMeta; import org.dbflute.dbmeta.info.ColumnInfo; @@ -79,10 +80,8 @@ public class DataConfigToRoleDbm extends AbstractDBMeta { // --------------- protected final Map _epgMap = newHashMap(); { - setupEpg(_epgMap, et -> ((DataConfigToRole) et).getDataConfigId(), - (et, vl) -> ((DataConfigToRole) et).setDataConfigId(DfTypeUtil.toString(vl)), "dataConfigId"); - setupEpg(_epgMap, et -> ((DataConfigToRole) et).getRoleTypeId(), - (et, vl) -> ((DataConfigToRole) et).setRoleTypeId(DfTypeUtil.toString(vl)), "roleTypeId"); + setupEpg(_epgMap, et-> ((DataConfigToRole)et).getDataConfigId(),(et,vl)->((DataConfigToRole) et).setDataConfigId(DfTypeUtil.toString(vl)), "dataConfigId"); + setupEpg(_epgMap, et-> ((DataConfigToRole)et).getRoleTypeId(),(et,vl)->((DataConfigToRole) et).setRoleTypeId(DfTypeUtil.toString(vl)), "roleTypeId"); } @Override @@ -96,41 +95,22 @@ public class DataConfigToRoleDbm extends AbstractDBMeta { protected final String _tableDbName = "data_config_to_role"; protected final String _tableDispName = "data_config_to_role"; protected final String _tablePropertyName = "DataConfigToRole"; - - public String getTableDbName() { - return _tableDbName; - } - + public String getTableDbName() { return _tableDbName; } @Override - public String getTableDispName() { - return _tableDispName; - } - + public String getTableDispName() { return _tableDispName; } @Override - public String getTablePropertyName() { - return _tablePropertyName; - } - + public String getTablePropertyName() { return _tablePropertyName; } @Override - public TableSqlName getTableSqlName() { - return null; - } + public TableSqlName getTableSqlName() { return null; } // =================================================================================== // Column Info // =========== - protected final ColumnInfo _columnDataConfigId = cci("dataConfigId", "dataConfigId", null, null, String.class, "dataConfigId", null, - false, false, false, "String", 0, 0, null, false, null, null, null, null, null, false); - protected final ColumnInfo _columnRoleTypeId = cci("roleTypeId", "roleTypeId", null, null, String.class, "roleTypeId", null, false, - false, false, "String", 0, 0, null, false, null, null, null, null, null, false); + protected final ColumnInfo _columnDataConfigId = cci("dataConfigId", "dataConfigId", null, null, String.class, "dataConfigId", null, false, false, false, "String", 0, 0, null, false, null, null, null, null, null, false); + protected final ColumnInfo _columnRoleTypeId = cci("roleTypeId", "roleTypeId", null, null, String.class, "roleTypeId", null, false, false, false, "String", 0, 0, null, false, null, null, null, null, null, false); - public ColumnInfo columnDataConfigId() { - return _columnDataConfigId; - } - - public ColumnInfo columnRoleTypeId() { - return _columnRoleTypeId; - } + public ColumnInfo columnDataConfigId() { return _columnDataConfigId; } + public ColumnInfo columnRoleTypeId() { return _columnRoleTypeId; } protected List ccil() { List ls = newArrayList(); @@ -212,3 +192,4 @@ public class DataConfigToRoleDbm extends AbstractDBMeta { return null; } } + diff --git a/src/main/java/org/codelibs/fess/es/config/bsentity/dbmeta/DuplicateHostDbm.java b/src/main/java/org/codelibs/fess/es/config/bsentity/dbmeta/DuplicateHostDbm.java index 83a5d79f6..d9cecaf26 100644 --- a/src/main/java/org/codelibs/fess/es/config/bsentity/dbmeta/DuplicateHostDbm.java +++ b/src/main/java/org/codelibs/fess/es/config/bsentity/dbmeta/DuplicateHostDbm.java @@ -15,11 +15,12 @@ */ package org.codelibs.fess.es.config.bsentity.dbmeta; -import java.time.LocalDateTime; +import java.time.*; import java.util.List; import java.util.Map; import org.codelibs.fess.es.config.exentity.DuplicateHost; + import org.dbflute.Entity; import org.dbflute.dbmeta.AbstractDBMeta; import org.dbflute.dbmeta.info.ColumnInfo; @@ -79,20 +80,13 @@ public class DuplicateHostDbm extends AbstractDBMeta { // --------------- protected final Map _epgMap = newHashMap(); { - setupEpg(_epgMap, et -> ((DuplicateHost) et).getCreatedBy(), - (et, vl) -> ((DuplicateHost) et).setCreatedBy(DfTypeUtil.toString(vl)), "createdBy"); - setupEpg(_epgMap, et -> ((DuplicateHost) et).getCreatedTime(), - (et, vl) -> ((DuplicateHost) et).setCreatedTime(DfTypeUtil.toLong(vl)), "createdTime"); - setupEpg(_epgMap, et -> ((DuplicateHost) et).getDuplicateHostName(), - (et, vl) -> ((DuplicateHost) et).setDuplicateHostName(DfTypeUtil.toString(vl)), "duplicateHostName"); - setupEpg(_epgMap, et -> ((DuplicateHost) et).getRegularName(), - (et, vl) -> ((DuplicateHost) et).setRegularName(DfTypeUtil.toString(vl)), "regularName"); - setupEpg(_epgMap, et -> ((DuplicateHost) et).getSortOrder(), - (et, vl) -> ((DuplicateHost) et).setSortOrder(DfTypeUtil.toInteger(vl)), "sortOrder"); - setupEpg(_epgMap, et -> ((DuplicateHost) et).getUpdatedBy(), - (et, vl) -> ((DuplicateHost) et).setUpdatedBy(DfTypeUtil.toString(vl)), "updatedBy"); - setupEpg(_epgMap, et -> ((DuplicateHost) et).getUpdatedTime(), - (et, vl) -> ((DuplicateHost) et).setUpdatedTime(DfTypeUtil.toLong(vl)), "updatedTime"); + setupEpg(_epgMap, et-> ((DuplicateHost)et).getCreatedBy(),(et,vl)->((DuplicateHost) et).setCreatedBy(DfTypeUtil.toString(vl)), "createdBy"); + setupEpg(_epgMap, et-> ((DuplicateHost)et).getCreatedTime(),(et,vl)->((DuplicateHost) et).setCreatedTime(DfTypeUtil.toLong(vl)), "createdTime"); + setupEpg(_epgMap, et-> ((DuplicateHost)et).getDuplicateHostName(),(et,vl)->((DuplicateHost) et).setDuplicateHostName(DfTypeUtil.toString(vl)), "duplicateHostName"); + setupEpg(_epgMap, et-> ((DuplicateHost)et).getRegularName(),(et,vl)->((DuplicateHost) et).setRegularName(DfTypeUtil.toString(vl)), "regularName"); + setupEpg(_epgMap, et-> ((DuplicateHost)et).getSortOrder(),(et,vl)->((DuplicateHost) et).setSortOrder(DfTypeUtil.toInteger(vl)), "sortOrder"); + setupEpg(_epgMap, et-> ((DuplicateHost)et).getUpdatedBy(),(et,vl)->((DuplicateHost) et).setUpdatedBy(DfTypeUtil.toString(vl)), "updatedBy"); + setupEpg(_epgMap, et-> ((DuplicateHost)et).getUpdatedTime(),(et,vl)->((DuplicateHost) et).setUpdatedTime(DfTypeUtil.toLong(vl)), "updatedTime"); } @Override @@ -106,71 +100,32 @@ public class DuplicateHostDbm extends AbstractDBMeta { protected final String _tableDbName = "duplicate_host"; protected final String _tableDispName = "duplicate_host"; protected final String _tablePropertyName = "DuplicateHost"; - - public String getTableDbName() { - return _tableDbName; - } - + public String getTableDbName() { return _tableDbName; } @Override - public String getTableDispName() { - return _tableDispName; - } - + public String getTableDispName() { return _tableDispName; } @Override - public String getTablePropertyName() { - return _tablePropertyName; - } - + public String getTablePropertyName() { return _tablePropertyName; } @Override - public TableSqlName getTableSqlName() { - return null; - } + public TableSqlName getTableSqlName() { return null; } // =================================================================================== // Column Info // =========== - protected final ColumnInfo _columnCreatedBy = cci("createdBy", "createdBy", null, null, String.class, "createdBy", null, false, false, - false, "String", 0, 0, null, false, null, null, null, null, null, false); - protected final ColumnInfo _columnCreatedTime = cci("createdTime", "createdTime", null, null, Long.class, "createdTime", null, false, - false, false, "Long", 0, 0, null, false, null, null, null, null, null, false); - protected final ColumnInfo _columnDuplicateHostName = cci("duplicateHostName", "duplicateHostName", null, null, String.class, - "duplicateHostName", null, false, false, false, "String", 0, 0, null, false, null, null, null, null, null, false); - protected final ColumnInfo _columnRegularName = cci("regularName", "regularName", null, null, String.class, "regularName", null, false, - false, false, "String", 0, 0, null, false, null, null, null, null, null, false); - protected final ColumnInfo _columnSortOrder = cci("sortOrder", "sortOrder", null, null, Integer.class, "sortOrder", null, false, false, - false, "Integer", 0, 0, null, false, null, null, null, null, null, false); - protected final ColumnInfo _columnUpdatedBy = cci("updatedBy", "updatedBy", null, null, String.class, "updatedBy", null, false, false, - false, "String", 0, 0, null, false, null, null, null, null, null, false); - protected final ColumnInfo _columnUpdatedTime = cci("updatedTime", "updatedTime", null, null, Long.class, "updatedTime", null, false, - false, false, "Long", 0, 0, null, false, null, null, null, null, null, false); + protected final ColumnInfo _columnCreatedBy = cci("createdBy", "createdBy", null, null, String.class, "createdBy", null, false, false, false, "String", 0, 0, null, false, null, null, null, null, null, false); + protected final ColumnInfo _columnCreatedTime = cci("createdTime", "createdTime", null, null, Long.class, "createdTime", null, false, false, false, "Long", 0, 0, null, false, null, null, null, null, null, false); + protected final ColumnInfo _columnDuplicateHostName = cci("duplicateHostName", "duplicateHostName", null, null, String.class, "duplicateHostName", null, false, false, false, "String", 0, 0, null, false, null, null, null, null, null, false); + protected final ColumnInfo _columnRegularName = cci("regularName", "regularName", null, null, String.class, "regularName", null, false, false, false, "String", 0, 0, null, false, null, null, null, null, null, false); + protected final ColumnInfo _columnSortOrder = cci("sortOrder", "sortOrder", null, null, Integer.class, "sortOrder", null, false, false, false, "Integer", 0, 0, null, false, null, null, null, null, null, false); + protected final ColumnInfo _columnUpdatedBy = cci("updatedBy", "updatedBy", null, null, String.class, "updatedBy", null, false, false, false, "String", 0, 0, null, false, null, null, null, null, null, false); + protected final ColumnInfo _columnUpdatedTime = cci("updatedTime", "updatedTime", null, null, Long.class, "updatedTime", null, false, false, false, "Long", 0, 0, null, false, null, null, null, null, null, false); - public ColumnInfo columnCreatedBy() { - return _columnCreatedBy; - } - - public ColumnInfo columnCreatedTime() { - return _columnCreatedTime; - } - - public ColumnInfo columnDuplicateHostName() { - return _columnDuplicateHostName; - } - - public ColumnInfo columnRegularName() { - return _columnRegularName; - } - - public ColumnInfo columnSortOrder() { - return _columnSortOrder; - } - - public ColumnInfo columnUpdatedBy() { - return _columnUpdatedBy; - } - - public ColumnInfo columnUpdatedTime() { - return _columnUpdatedTime; - } + public ColumnInfo columnCreatedBy() { return _columnCreatedBy; } + public ColumnInfo columnCreatedTime() { return _columnCreatedTime; } + public ColumnInfo columnDuplicateHostName() { return _columnDuplicateHostName; } + public ColumnInfo columnRegularName() { return _columnRegularName; } + public ColumnInfo columnSortOrder() { return _columnSortOrder; } + public ColumnInfo columnUpdatedBy() { return _columnUpdatedBy; } + public ColumnInfo columnUpdatedTime() { return _columnUpdatedTime; } protected List ccil() { List ls = newArrayList(); @@ -257,3 +212,4 @@ public class DuplicateHostDbm extends AbstractDBMeta { return null; } } + diff --git a/src/main/java/org/codelibs/fess/es/config/bsentity/dbmeta/FailureUrlDbm.java b/src/main/java/org/codelibs/fess/es/config/bsentity/dbmeta/FailureUrlDbm.java index 12952b846..7a68dc643 100644 --- a/src/main/java/org/codelibs/fess/es/config/bsentity/dbmeta/FailureUrlDbm.java +++ b/src/main/java/org/codelibs/fess/es/config/bsentity/dbmeta/FailureUrlDbm.java @@ -15,11 +15,12 @@ */ package org.codelibs.fess.es.config.bsentity.dbmeta; -import java.time.LocalDateTime; +import java.time.*; import java.util.List; import java.util.Map; import org.codelibs.fess.es.config.exentity.FailureUrl; + import org.dbflute.Entity; import org.dbflute.dbmeta.AbstractDBMeta; import org.dbflute.dbmeta.info.ColumnInfo; @@ -79,19 +80,13 @@ public class FailureUrlDbm extends AbstractDBMeta { // --------------- protected final Map _epgMap = newHashMap(); { - setupEpg(_epgMap, et -> ((FailureUrl) et).getConfigId(), (et, vl) -> ((FailureUrl) et).setConfigId(DfTypeUtil.toString(vl)), - "configId"); - setupEpg(_epgMap, et -> ((FailureUrl) et).getErrorCount(), (et, vl) -> ((FailureUrl) et).setErrorCount(DfTypeUtil.toInteger(vl)), - "errorCount"); - setupEpg(_epgMap, et -> ((FailureUrl) et).getErrorLog(), (et, vl) -> ((FailureUrl) et).setErrorLog(DfTypeUtil.toString(vl)), - "errorLog"); - setupEpg(_epgMap, et -> ((FailureUrl) et).getErrorName(), (et, vl) -> ((FailureUrl) et).setErrorName(DfTypeUtil.toString(vl)), - "errorName"); - setupEpg(_epgMap, et -> ((FailureUrl) et).getLastAccessTime(), - (et, vl) -> ((FailureUrl) et).setLastAccessTime(DfTypeUtil.toLong(vl)), "lastAccessTime"); - setupEpg(_epgMap, et -> ((FailureUrl) et).getThreadName(), (et, vl) -> ((FailureUrl) et).setThreadName(DfTypeUtil.toString(vl)), - "threadName"); - setupEpg(_epgMap, et -> ((FailureUrl) et).getUrl(), (et, vl) -> ((FailureUrl) et).setUrl(DfTypeUtil.toString(vl)), "url"); + setupEpg(_epgMap, et-> ((FailureUrl)et).getConfigId(),(et,vl)->((FailureUrl) et).setConfigId(DfTypeUtil.toString(vl)), "configId"); + setupEpg(_epgMap, et-> ((FailureUrl)et).getErrorCount(),(et,vl)->((FailureUrl) et).setErrorCount(DfTypeUtil.toInteger(vl)), "errorCount"); + setupEpg(_epgMap, et-> ((FailureUrl)et).getErrorLog(),(et,vl)->((FailureUrl) et).setErrorLog(DfTypeUtil.toString(vl)), "errorLog"); + setupEpg(_epgMap, et-> ((FailureUrl)et).getErrorName(),(et,vl)->((FailureUrl) et).setErrorName(DfTypeUtil.toString(vl)), "errorName"); + setupEpg(_epgMap, et-> ((FailureUrl)et).getLastAccessTime(),(et,vl)->((FailureUrl) et).setLastAccessTime(DfTypeUtil.toLong(vl)), "lastAccessTime"); + setupEpg(_epgMap, et-> ((FailureUrl)et).getThreadName(),(et,vl)->((FailureUrl) et).setThreadName(DfTypeUtil.toString(vl)), "threadName"); + setupEpg(_epgMap, et-> ((FailureUrl)et).getUrl(),(et,vl)->((FailureUrl) et).setUrl(DfTypeUtil.toString(vl)), "url"); } @Override @@ -105,71 +100,32 @@ public class FailureUrlDbm extends AbstractDBMeta { protected final String _tableDbName = "failure_url"; protected final String _tableDispName = "failure_url"; protected final String _tablePropertyName = "FailureUrl"; - - public String getTableDbName() { - return _tableDbName; - } - + public String getTableDbName() { return _tableDbName; } @Override - public String getTableDispName() { - return _tableDispName; - } - + public String getTableDispName() { return _tableDispName; } @Override - public String getTablePropertyName() { - return _tablePropertyName; - } - + public String getTablePropertyName() { return _tablePropertyName; } @Override - public TableSqlName getTableSqlName() { - return null; - } + public TableSqlName getTableSqlName() { return null; } // =================================================================================== // Column Info // =========== - protected final ColumnInfo _columnConfigId = cci("configId", "configId", null, null, String.class, "configId", null, false, false, - false, "String", 0, 0, null, false, null, null, null, null, null, false); - protected final ColumnInfo _columnErrorCount = cci("errorCount", "errorCount", null, null, Integer.class, "errorCount", null, false, - false, false, "Integer", 0, 0, null, false, null, null, null, null, null, false); - protected final ColumnInfo _columnErrorLog = cci("errorLog", "errorLog", null, null, String.class, "errorLog", null, false, false, - false, "String", 0, 0, null, false, null, null, null, null, null, false); - protected final ColumnInfo _columnErrorName = cci("errorName", "errorName", null, null, String.class, "errorName", null, false, false, - false, "String", 0, 0, null, false, null, null, null, null, null, false); - protected final ColumnInfo _columnLastAccessTime = cci("lastAccessTime", "lastAccessTime", null, null, Long.class, "lastAccessTime", - null, false, false, false, "Long", 0, 0, null, false, null, null, null, null, null, false); - protected final ColumnInfo _columnThreadName = cci("threadName", "threadName", null, null, String.class, "threadName", null, false, - false, false, "String", 0, 0, null, false, null, null, null, null, null, false); - protected final ColumnInfo _columnUrl = cci("url", "url", null, null, String.class, "url", null, false, false, false, "String", 0, 0, - null, false, null, null, null, null, null, false); + protected final ColumnInfo _columnConfigId = cci("configId", "configId", null, null, String.class, "configId", null, false, false, false, "String", 0, 0, null, false, null, null, null, null, null, false); + protected final ColumnInfo _columnErrorCount = cci("errorCount", "errorCount", null, null, Integer.class, "errorCount", null, false, false, false, "Integer", 0, 0, null, false, null, null, null, null, null, false); + protected final ColumnInfo _columnErrorLog = cci("errorLog", "errorLog", null, null, String.class, "errorLog", null, false, false, false, "String", 0, 0, null, false, null, null, null, null, null, false); + protected final ColumnInfo _columnErrorName = cci("errorName", "errorName", null, null, String.class, "errorName", null, false, false, false, "String", 0, 0, null, false, null, null, null, null, null, false); + protected final ColumnInfo _columnLastAccessTime = cci("lastAccessTime", "lastAccessTime", null, null, Long.class, "lastAccessTime", null, false, false, false, "Long", 0, 0, null, false, null, null, null, null, null, false); + protected final ColumnInfo _columnThreadName = cci("threadName", "threadName", null, null, String.class, "threadName", null, false, false, false, "String", 0, 0, null, false, null, null, null, null, null, false); + protected final ColumnInfo _columnUrl = cci("url", "url", null, null, String.class, "url", null, false, false, false, "String", 0, 0, null, false, null, null, null, null, null, false); - public ColumnInfo columnConfigId() { - return _columnConfigId; - } - - public ColumnInfo columnErrorCount() { - return _columnErrorCount; - } - - public ColumnInfo columnErrorLog() { - return _columnErrorLog; - } - - public ColumnInfo columnErrorName() { - return _columnErrorName; - } - - public ColumnInfo columnLastAccessTime() { - return _columnLastAccessTime; - } - - public ColumnInfo columnThreadName() { - return _columnThreadName; - } - - public ColumnInfo columnUrl() { - return _columnUrl; - } + public ColumnInfo columnConfigId() { return _columnConfigId; } + public ColumnInfo columnErrorCount() { return _columnErrorCount; } + public ColumnInfo columnErrorLog() { return _columnErrorLog; } + public ColumnInfo columnErrorName() { return _columnErrorName; } + public ColumnInfo columnLastAccessTime() { return _columnLastAccessTime; } + public ColumnInfo columnThreadName() { return _columnThreadName; } + public ColumnInfo columnUrl() { return _columnUrl; } protected List ccil() { List ls = newArrayList(); @@ -256,3 +212,4 @@ public class FailureUrlDbm extends AbstractDBMeta { return null; } } + diff --git a/src/main/java/org/codelibs/fess/es/config/bsentity/dbmeta/FileAuthenticationDbm.java b/src/main/java/org/codelibs/fess/es/config/bsentity/dbmeta/FileAuthenticationDbm.java index 40099ecda..a788f19fc 100644 --- a/src/main/java/org/codelibs/fess/es/config/bsentity/dbmeta/FileAuthenticationDbm.java +++ b/src/main/java/org/codelibs/fess/es/config/bsentity/dbmeta/FileAuthenticationDbm.java @@ -15,11 +15,12 @@ */ package org.codelibs.fess.es.config.bsentity.dbmeta; -import java.time.LocalDateTime; +import java.time.*; import java.util.List; import java.util.Map; import org.codelibs.fess.es.config.exentity.FileAuthentication; + import org.dbflute.Entity; import org.dbflute.dbmeta.AbstractDBMeta; import org.dbflute.dbmeta.info.ColumnInfo; @@ -79,28 +80,17 @@ public class FileAuthenticationDbm extends AbstractDBMeta { // --------------- protected final Map _epgMap = newHashMap(); { - setupEpg(_epgMap, et -> ((FileAuthentication) et).getCreatedBy(), - (et, vl) -> ((FileAuthentication) et).setCreatedBy(DfTypeUtil.toString(vl)), "createdBy"); - setupEpg(_epgMap, et -> ((FileAuthentication) et).getCreatedTime(), - (et, vl) -> ((FileAuthentication) et).setCreatedTime(DfTypeUtil.toLong(vl)), "createdTime"); - setupEpg(_epgMap, et -> ((FileAuthentication) et).getFileConfigId(), - (et, vl) -> ((FileAuthentication) et).setFileConfigId(DfTypeUtil.toString(vl)), "fileConfigId"); - setupEpg(_epgMap, et -> ((FileAuthentication) et).getHostname(), - (et, vl) -> ((FileAuthentication) et).setHostname(DfTypeUtil.toString(vl)), "hostname"); - setupEpg(_epgMap, et -> ((FileAuthentication) et).getParameters(), - (et, vl) -> ((FileAuthentication) et).setParameters(DfTypeUtil.toString(vl)), "parameters"); - setupEpg(_epgMap, et -> ((FileAuthentication) et).getPassword(), - (et, vl) -> ((FileAuthentication) et).setPassword(DfTypeUtil.toString(vl)), "password"); - setupEpg(_epgMap, et -> ((FileAuthentication) et).getPort(), - (et, vl) -> ((FileAuthentication) et).setPort(DfTypeUtil.toInteger(vl)), "port"); - setupEpg(_epgMap, et -> ((FileAuthentication) et).getProtocolScheme(), - (et, vl) -> ((FileAuthentication) et).setProtocolScheme(DfTypeUtil.toString(vl)), "protocolScheme"); - setupEpg(_epgMap, et -> ((FileAuthentication) et).getUpdatedBy(), - (et, vl) -> ((FileAuthentication) et).setUpdatedBy(DfTypeUtil.toString(vl)), "updatedBy"); - setupEpg(_epgMap, et -> ((FileAuthentication) et).getUpdatedTime(), - (et, vl) -> ((FileAuthentication) et).setUpdatedTime(DfTypeUtil.toLong(vl)), "updatedTime"); - setupEpg(_epgMap, et -> ((FileAuthentication) et).getUsername(), - (et, vl) -> ((FileAuthentication) et).setUsername(DfTypeUtil.toString(vl)), "username"); + setupEpg(_epgMap, et-> ((FileAuthentication)et).getCreatedBy(),(et,vl)->((FileAuthentication) et).setCreatedBy(DfTypeUtil.toString(vl)), "createdBy"); + setupEpg(_epgMap, et-> ((FileAuthentication)et).getCreatedTime(),(et,vl)->((FileAuthentication) et).setCreatedTime(DfTypeUtil.toLong(vl)), "createdTime"); + setupEpg(_epgMap, et-> ((FileAuthentication)et).getFileConfigId(),(et,vl)->((FileAuthentication) et).setFileConfigId(DfTypeUtil.toString(vl)), "fileConfigId"); + setupEpg(_epgMap, et-> ((FileAuthentication)et).getHostname(),(et,vl)->((FileAuthentication) et).setHostname(DfTypeUtil.toString(vl)), "hostname"); + setupEpg(_epgMap, et-> ((FileAuthentication)et).getParameters(),(et,vl)->((FileAuthentication) et).setParameters(DfTypeUtil.toString(vl)), "parameters"); + setupEpg(_epgMap, et-> ((FileAuthentication)et).getPassword(),(et,vl)->((FileAuthentication) et).setPassword(DfTypeUtil.toString(vl)), "password"); + setupEpg(_epgMap, et-> ((FileAuthentication)et).getPort(),(et,vl)->((FileAuthentication) et).setPort(DfTypeUtil.toInteger(vl)), "port"); + setupEpg(_epgMap, et-> ((FileAuthentication)et).getProtocolScheme(),(et,vl)->((FileAuthentication) et).setProtocolScheme(DfTypeUtil.toString(vl)), "protocolScheme"); + setupEpg(_epgMap, et-> ((FileAuthentication)et).getUpdatedBy(),(et,vl)->((FileAuthentication) et).setUpdatedBy(DfTypeUtil.toString(vl)), "updatedBy"); + setupEpg(_epgMap, et-> ((FileAuthentication)et).getUpdatedTime(),(et,vl)->((FileAuthentication) et).setUpdatedTime(DfTypeUtil.toLong(vl)), "updatedTime"); + setupEpg(_epgMap, et-> ((FileAuthentication)et).getUsername(),(et,vl)->((FileAuthentication) et).setUsername(DfTypeUtil.toString(vl)), "username"); } @Override @@ -114,95 +104,40 @@ public class FileAuthenticationDbm extends AbstractDBMeta { protected final String _tableDbName = "file_authentication"; protected final String _tableDispName = "file_authentication"; protected final String _tablePropertyName = "FileAuthentication"; - - public String getTableDbName() { - return _tableDbName; - } - + public String getTableDbName() { return _tableDbName; } @Override - public String getTableDispName() { - return _tableDispName; - } - + public String getTableDispName() { return _tableDispName; } @Override - public String getTablePropertyName() { - return _tablePropertyName; - } - + public String getTablePropertyName() { return _tablePropertyName; } @Override - public TableSqlName getTableSqlName() { - return null; - } + public TableSqlName getTableSqlName() { return null; } // =================================================================================== // Column Info // =========== - protected final ColumnInfo _columnCreatedBy = cci("createdBy", "createdBy", null, null, String.class, "createdBy", null, false, false, - false, "String", 0, 0, null, false, null, null, null, null, null, false); - protected final ColumnInfo _columnCreatedTime = cci("createdTime", "createdTime", null, null, Long.class, "createdTime", null, false, - false, false, "Long", 0, 0, null, false, null, null, null, null, null, false); - protected final ColumnInfo _columnFileConfigId = cci("fileConfigId", "fileConfigId", null, null, String.class, "fileConfigId", null, - false, false, false, "String", 0, 0, null, false, null, null, null, null, null, false); - protected final ColumnInfo _columnHostname = cci("hostname", "hostname", null, null, String.class, "hostname", null, false, false, - false, "String", 0, 0, null, false, null, null, null, null, null, false); - protected final ColumnInfo _columnParameters = cci("parameters", "parameters", null, null, String.class, "parameters", null, false, - false, false, "String", 0, 0, null, false, null, null, null, null, null, false); - protected final ColumnInfo _columnPassword = cci("password", "password", null, null, String.class, "password", null, false, false, - false, "String", 0, 0, null, false, null, null, null, null, null, false); - protected final ColumnInfo _columnPort = cci("port", "port", null, null, Integer.class, "port", null, false, false, false, "Integer", - 0, 0, null, false, null, null, null, null, null, false); - protected final ColumnInfo _columnProtocolScheme = cci("protocolScheme", "protocolScheme", null, null, String.class, "protocolScheme", - null, false, false, false, "String", 0, 0, null, false, null, null, null, null, null, false); - protected final ColumnInfo _columnUpdatedBy = cci("updatedBy", "updatedBy", null, null, String.class, "updatedBy", null, false, false, - false, "String", 0, 0, null, false, null, null, null, null, null, false); - protected final ColumnInfo _columnUpdatedTime = cci("updatedTime", "updatedTime", null, null, Long.class, "updatedTime", null, false, - false, false, "Long", 0, 0, null, false, null, null, null, null, null, false); - protected final ColumnInfo _columnUsername = cci("username", "username", null, null, String.class, "username", null, false, false, - false, "String", 0, 0, null, false, null, null, null, null, null, false); + protected final ColumnInfo _columnCreatedBy = cci("createdBy", "createdBy", null, null, String.class, "createdBy", null, false, false, false, "String", 0, 0, null, false, null, null, null, null, null, false); + protected final ColumnInfo _columnCreatedTime = cci("createdTime", "createdTime", null, null, Long.class, "createdTime", null, false, false, false, "Long", 0, 0, null, false, null, null, null, null, null, false); + protected final ColumnInfo _columnFileConfigId = cci("fileConfigId", "fileConfigId", null, null, String.class, "fileConfigId", null, false, false, false, "String", 0, 0, null, false, null, null, null, null, null, false); + protected final ColumnInfo _columnHostname = cci("hostname", "hostname", null, null, String.class, "hostname", null, false, false, false, "String", 0, 0, null, false, null, null, null, null, null, false); + protected final ColumnInfo _columnParameters = cci("parameters", "parameters", null, null, String.class, "parameters", null, false, false, false, "String", 0, 0, null, false, null, null, null, null, null, false); + protected final ColumnInfo _columnPassword = cci("password", "password", null, null, String.class, "password", null, false, false, false, "String", 0, 0, null, false, null, null, null, null, null, false); + protected final ColumnInfo _columnPort = cci("port", "port", null, null, Integer.class, "port", null, false, false, false, "Integer", 0, 0, null, false, null, null, null, null, null, false); + protected final ColumnInfo _columnProtocolScheme = cci("protocolScheme", "protocolScheme", null, null, String.class, "protocolScheme", null, false, false, false, "String", 0, 0, null, false, null, null, null, null, null, false); + protected final ColumnInfo _columnUpdatedBy = cci("updatedBy", "updatedBy", null, null, String.class, "updatedBy", null, false, false, false, "String", 0, 0, null, false, null, null, null, null, null, false); + protected final ColumnInfo _columnUpdatedTime = cci("updatedTime", "updatedTime", null, null, Long.class, "updatedTime", null, false, false, false, "Long", 0, 0, null, false, null, null, null, null, null, false); + protected final ColumnInfo _columnUsername = cci("username", "username", null, null, String.class, "username", null, false, false, false, "String", 0, 0, null, false, null, null, null, null, null, false); - public ColumnInfo columnCreatedBy() { - return _columnCreatedBy; - } - - public ColumnInfo columnCreatedTime() { - return _columnCreatedTime; - } - - public ColumnInfo columnFileConfigId() { - return _columnFileConfigId; - } - - public ColumnInfo columnHostname() { - return _columnHostname; - } - - public ColumnInfo columnParameters() { - return _columnParameters; - } - - public ColumnInfo columnPassword() { - return _columnPassword; - } - - public ColumnInfo columnPort() { - return _columnPort; - } - - public ColumnInfo columnProtocolScheme() { - return _columnProtocolScheme; - } - - public ColumnInfo columnUpdatedBy() { - return _columnUpdatedBy; - } - - public ColumnInfo columnUpdatedTime() { - return _columnUpdatedTime; - } - - public ColumnInfo columnUsername() { - return _columnUsername; - } + public ColumnInfo columnCreatedBy() { return _columnCreatedBy; } + public ColumnInfo columnCreatedTime() { return _columnCreatedTime; } + public ColumnInfo columnFileConfigId() { return _columnFileConfigId; } + public ColumnInfo columnHostname() { return _columnHostname; } + public ColumnInfo columnParameters() { return _columnParameters; } + public ColumnInfo columnPassword() { return _columnPassword; } + public ColumnInfo columnPort() { return _columnPort; } + public ColumnInfo columnProtocolScheme() { return _columnProtocolScheme; } + public ColumnInfo columnUpdatedBy() { return _columnUpdatedBy; } + public ColumnInfo columnUpdatedTime() { return _columnUpdatedTime; } + public ColumnInfo columnUsername() { return _columnUsername; } protected List ccil() { List ls = newArrayList(); @@ -293,3 +228,4 @@ public class FileAuthenticationDbm extends AbstractDBMeta { return null; } } + diff --git a/src/main/java/org/codelibs/fess/es/config/bsentity/dbmeta/FileConfigDbm.java b/src/main/java/org/codelibs/fess/es/config/bsentity/dbmeta/FileConfigDbm.java index 0242fbed0..fe155fee4 100644 --- a/src/main/java/org/codelibs/fess/es/config/bsentity/dbmeta/FileConfigDbm.java +++ b/src/main/java/org/codelibs/fess/es/config/bsentity/dbmeta/FileConfigDbm.java @@ -15,11 +15,12 @@ */ package org.codelibs.fess.es.config.bsentity.dbmeta; -import java.time.LocalDateTime; +import java.time.*; import java.util.List; import java.util.Map; import org.codelibs.fess.es.config.exentity.FileConfig; + import org.dbflute.Entity; import org.dbflute.dbmeta.AbstractDBMeta; import org.dbflute.dbmeta.info.ColumnInfo; @@ -79,40 +80,25 @@ public class FileConfigDbm extends AbstractDBMeta { // --------------- protected final Map _epgMap = newHashMap(); { - setupEpg(_epgMap, et -> ((FileConfig) et).getAvailable(), (et, vl) -> ((FileConfig) et).setAvailable(DfTypeUtil.toBoolean(vl)), - "available"); - setupEpg(_epgMap, et -> ((FileConfig) et).getBoost(), (et, vl) -> ((FileConfig) et).setBoost(DfTypeUtil.toFloat(vl)), "boost"); - setupEpg(_epgMap, et -> ((FileConfig) et).getConfigParameter(), - (et, vl) -> ((FileConfig) et).setConfigParameter(DfTypeUtil.toString(vl)), "configParameter"); - setupEpg(_epgMap, et -> ((FileConfig) et).getCreatedBy(), (et, vl) -> ((FileConfig) et).setCreatedBy(DfTypeUtil.toString(vl)), - "createdBy"); - setupEpg(_epgMap, et -> ((FileConfig) et).getCreatedTime(), (et, vl) -> ((FileConfig) et).setCreatedTime(DfTypeUtil.toLong(vl)), - "createdTime"); - setupEpg(_epgMap, et -> ((FileConfig) et).getDepth(), (et, vl) -> ((FileConfig) et).setDepth(DfTypeUtil.toInteger(vl)), "depth"); - setupEpg(_epgMap, et -> ((FileConfig) et).getExcludedDocPaths(), - (et, vl) -> ((FileConfig) et).setExcludedDocPaths(DfTypeUtil.toString(vl)), "excludedDocPaths"); - setupEpg(_epgMap, et -> ((FileConfig) et).getExcludedPaths(), - (et, vl) -> ((FileConfig) et).setExcludedPaths(DfTypeUtil.toString(vl)), "excludedPaths"); - setupEpg(_epgMap, et -> ((FileConfig) et).getIncludedDocPaths(), - (et, vl) -> ((FileConfig) et).setIncludedDocPaths(DfTypeUtil.toString(vl)), "includedDocPaths"); - setupEpg(_epgMap, et -> ((FileConfig) et).getIncludedPaths(), - (et, vl) -> ((FileConfig) et).setIncludedPaths(DfTypeUtil.toString(vl)), "includedPaths"); - setupEpg(_epgMap, et -> ((FileConfig) et).getIntervalTime(), - (et, vl) -> ((FileConfig) et).setIntervalTime(DfTypeUtil.toInteger(vl)), "intervalTime"); - setupEpg(_epgMap, et -> ((FileConfig) et).getTimeToLive(), (et, vl) -> ((FileConfig) et).setTimeToLive(DfTypeUtil.toInteger(vl)), - "timeToLive"); - setupEpg(_epgMap, et -> ((FileConfig) et).getMaxAccessCount(), - (et, vl) -> ((FileConfig) et).setMaxAccessCount(DfTypeUtil.toLong(vl)), "maxAccessCount"); - setupEpg(_epgMap, et -> ((FileConfig) et).getName(), (et, vl) -> ((FileConfig) et).setName(DfTypeUtil.toString(vl)), "name"); - setupEpg(_epgMap, et -> ((FileConfig) et).getNumOfThread(), (et, vl) -> ((FileConfig) et).setNumOfThread(DfTypeUtil.toInteger(vl)), - "numOfThread"); - setupEpg(_epgMap, et -> ((FileConfig) et).getPaths(), (et, vl) -> ((FileConfig) et).setPaths(DfTypeUtil.toString(vl)), "paths"); - setupEpg(_epgMap, et -> ((FileConfig) et).getSortOrder(), (et, vl) -> ((FileConfig) et).setSortOrder(DfTypeUtil.toInteger(vl)), - "sortOrder"); - setupEpg(_epgMap, et -> ((FileConfig) et).getUpdatedBy(), (et, vl) -> ((FileConfig) et).setUpdatedBy(DfTypeUtil.toString(vl)), - "updatedBy"); - setupEpg(_epgMap, et -> ((FileConfig) et).getUpdatedTime(), (et, vl) -> ((FileConfig) et).setUpdatedTime(DfTypeUtil.toLong(vl)), - "updatedTime"); + setupEpg(_epgMap, et-> ((FileConfig)et).getAvailable(),(et,vl)->((FileConfig) et).setAvailable(DfTypeUtil.toBoolean(vl)), "available"); + setupEpg(_epgMap, et-> ((FileConfig)et).getBoost(),(et,vl)->((FileConfig) et).setBoost(DfTypeUtil.toFloat(vl)), "boost"); + setupEpg(_epgMap, et-> ((FileConfig)et).getConfigParameter(),(et,vl)->((FileConfig) et).setConfigParameter(DfTypeUtil.toString(vl)), "configParameter"); + setupEpg(_epgMap, et-> ((FileConfig)et).getCreatedBy(),(et,vl)->((FileConfig) et).setCreatedBy(DfTypeUtil.toString(vl)), "createdBy"); + setupEpg(_epgMap, et-> ((FileConfig)et).getCreatedTime(),(et,vl)->((FileConfig) et).setCreatedTime(DfTypeUtil.toLong(vl)), "createdTime"); + setupEpg(_epgMap, et-> ((FileConfig)et).getDepth(),(et,vl)->((FileConfig) et).setDepth(DfTypeUtil.toInteger(vl)), "depth"); + setupEpg(_epgMap, et-> ((FileConfig)et).getExcludedDocPaths(),(et,vl)->((FileConfig) et).setExcludedDocPaths(DfTypeUtil.toString(vl)), "excludedDocPaths"); + setupEpg(_epgMap, et-> ((FileConfig)et).getExcludedPaths(),(et,vl)->((FileConfig) et).setExcludedPaths(DfTypeUtil.toString(vl)), "excludedPaths"); + setupEpg(_epgMap, et-> ((FileConfig)et).getIncludedDocPaths(),(et,vl)->((FileConfig) et).setIncludedDocPaths(DfTypeUtil.toString(vl)), "includedDocPaths"); + setupEpg(_epgMap, et-> ((FileConfig)et).getIncludedPaths(),(et,vl)->((FileConfig) et).setIncludedPaths(DfTypeUtil.toString(vl)), "includedPaths"); + setupEpg(_epgMap, et-> ((FileConfig)et).getIntervalTime(),(et,vl)->((FileConfig) et).setIntervalTime(DfTypeUtil.toInteger(vl)), "intervalTime"); + setupEpg(_epgMap, et-> ((FileConfig)et).getTimeToLive(),(et,vl)->((FileConfig) et).setTimeToLive(DfTypeUtil.toInteger(vl)), "timeToLive"); + setupEpg(_epgMap, et-> ((FileConfig)et).getMaxAccessCount(),(et,vl)->((FileConfig) et).setMaxAccessCount(DfTypeUtil.toLong(vl)), "maxAccessCount"); + setupEpg(_epgMap, et-> ((FileConfig)et).getName(),(et,vl)->((FileConfig) et).setName(DfTypeUtil.toString(vl)), "name"); + setupEpg(_epgMap, et-> ((FileConfig)et).getNumOfThread(),(et,vl)->((FileConfig) et).setNumOfThread(DfTypeUtil.toInteger(vl)), "numOfThread"); + setupEpg(_epgMap, et-> ((FileConfig)et).getPaths(),(et,vl)->((FileConfig) et).setPaths(DfTypeUtil.toString(vl)), "paths"); + setupEpg(_epgMap, et-> ((FileConfig)et).getSortOrder(),(et,vl)->((FileConfig) et).setSortOrder(DfTypeUtil.toInteger(vl)), "sortOrder"); + setupEpg(_epgMap, et-> ((FileConfig)et).getUpdatedBy(),(et,vl)->((FileConfig) et).setUpdatedBy(DfTypeUtil.toString(vl)), "updatedBy"); + setupEpg(_epgMap, et-> ((FileConfig)et).getUpdatedTime(),(et,vl)->((FileConfig) et).setUpdatedTime(DfTypeUtil.toLong(vl)), "updatedTime"); } @Override @@ -126,143 +112,56 @@ public class FileConfigDbm extends AbstractDBMeta { protected final String _tableDbName = "file_config"; protected final String _tableDispName = "file_config"; protected final String _tablePropertyName = "FileConfig"; - - public String getTableDbName() { - return _tableDbName; - } - + public String getTableDbName() { return _tableDbName; } @Override - public String getTableDispName() { - return _tableDispName; - } - + public String getTableDispName() { return _tableDispName; } @Override - public String getTablePropertyName() { - return _tablePropertyName; - } - + public String getTablePropertyName() { return _tablePropertyName; } @Override - public TableSqlName getTableSqlName() { - return null; - } + public TableSqlName getTableSqlName() { return null; } // =================================================================================== // Column Info // =========== - protected final ColumnInfo _columnAvailable = cci("available", "available", null, null, Boolean.class, "available", null, false, false, - false, "Boolean", 0, 0, null, false, null, null, null, null, null, false); - protected final ColumnInfo _columnBoost = cci("boost", "boost", null, null, Float.class, "boost", null, false, false, false, "Float", - 0, 0, null, false, null, null, null, null, null, false); - protected final ColumnInfo _columnConfigParameter = cci("configParameter", "configParameter", null, null, String.class, - "configParameter", null, false, false, false, "String", 0, 0, null, false, null, null, null, null, null, false); - protected final ColumnInfo _columnCreatedBy = cci("createdBy", "createdBy", null, null, String.class, "createdBy", null, false, false, - false, "String", 0, 0, null, false, null, null, null, null, null, false); - protected final ColumnInfo _columnCreatedTime = cci("createdTime", "createdTime", null, null, Long.class, "createdTime", null, false, - false, false, "Long", 0, 0, null, false, null, null, null, null, null, false); - protected final ColumnInfo _columnDepth = cci("depth", "depth", null, null, Integer.class, "depth", null, false, false, false, - "Integer", 0, 0, null, false, null, null, null, null, null, false); - protected final ColumnInfo _columnExcludedDocPaths = cci("excludedDocPaths", "excludedDocPaths", null, null, String.class, - "excludedDocPaths", null, false, false, false, "String", 0, 0, null, false, null, null, null, null, null, false); - protected final ColumnInfo _columnExcludedPaths = cci("excludedPaths", "excludedPaths", null, null, String.class, "excludedPaths", - null, false, false, false, "String", 0, 0, null, false, null, null, null, null, null, false); - protected final ColumnInfo _columnIncludedDocPaths = cci("includedDocPaths", "includedDocPaths", null, null, String.class, - "includedDocPaths", null, false, false, false, "String", 0, 0, null, false, null, null, null, null, null, false); - protected final ColumnInfo _columnIncludedPaths = cci("includedPaths", "includedPaths", null, null, String.class, "includedPaths", - null, false, false, false, "String", 0, 0, null, false, null, null, null, null, null, false); - protected final ColumnInfo _columnIntervalTime = cci("intervalTime", "intervalTime", null, null, Integer.class, "intervalTime", null, - false, false, false, "Integer", 0, 0, null, false, null, null, null, null, null, false); - protected final ColumnInfo _columnTimeToLive = cci("timeToLive", "timeToLive", null, null, Integer.class, "timeToLive", null, false, - false, false, "Integer", 0, 0, null, false, null, null, null, null, null, false); - protected final ColumnInfo _columnMaxAccessCount = cci("maxAccessCount", "maxAccessCount", null, null, Long.class, "maxAccessCount", - null, false, false, false, "Long", 0, 0, null, false, null, null, null, null, null, false); - protected final ColumnInfo _columnName = cci("name", "name", null, null, String.class, "name", null, false, false, false, "String", 0, - 0, null, false, null, null, null, null, null, false); - protected final ColumnInfo _columnNumOfThread = cci("numOfThread", "numOfThread", null, null, Integer.class, "numOfThread", null, - false, false, false, "Integer", 0, 0, null, false, null, null, null, null, null, false); - protected final ColumnInfo _columnPaths = cci("paths", "paths", null, null, String.class, "paths", null, false, false, false, "String", - 0, 0, null, false, null, null, null, null, null, false); - protected final ColumnInfo _columnSortOrder = cci("sortOrder", "sortOrder", null, null, Integer.class, "sortOrder", null, false, false, - false, "Integer", 0, 0, null, false, null, null, null, null, null, false); - protected final ColumnInfo _columnUpdatedBy = cci("updatedBy", "updatedBy", null, null, String.class, "updatedBy", null, false, false, - false, "String", 0, 0, null, false, null, null, null, null, null, false); - protected final ColumnInfo _columnUpdatedTime = cci("updatedTime", "updatedTime", null, null, Long.class, "updatedTime", null, false, - false, false, "Long", 0, 0, null, false, null, null, null, null, null, false); + protected final ColumnInfo _columnAvailable = cci("available", "available", null, null, Boolean.class, "available", null, false, false, false, "Boolean", 0, 0, null, false, null, null, null, null, null, false); + protected final ColumnInfo _columnBoost = cci("boost", "boost", null, null, Float.class, "boost", null, false, false, false, "Float", 0, 0, null, false, null, null, null, null, null, false); + protected final ColumnInfo _columnConfigParameter = cci("configParameter", "configParameter", null, null, String.class, "configParameter", null, false, false, false, "String", 0, 0, null, false, null, null, null, null, null, false); + protected final ColumnInfo _columnCreatedBy = cci("createdBy", "createdBy", null, null, String.class, "createdBy", null, false, false, false, "String", 0, 0, null, false, null, null, null, null, null, false); + protected final ColumnInfo _columnCreatedTime = cci("createdTime", "createdTime", null, null, Long.class, "createdTime", null, false, false, false, "Long", 0, 0, null, false, null, null, null, null, null, false); + protected final ColumnInfo _columnDepth = cci("depth", "depth", null, null, Integer.class, "depth", null, false, false, false, "Integer", 0, 0, null, false, null, null, null, null, null, false); + protected final ColumnInfo _columnExcludedDocPaths = cci("excludedDocPaths", "excludedDocPaths", null, null, String.class, "excludedDocPaths", null, false, false, false, "String", 0, 0, null, false, null, null, null, null, null, false); + protected final ColumnInfo _columnExcludedPaths = cci("excludedPaths", "excludedPaths", null, null, String.class, "excludedPaths", null, false, false, false, "String", 0, 0, null, false, null, null, null, null, null, false); + protected final ColumnInfo _columnIncludedDocPaths = cci("includedDocPaths", "includedDocPaths", null, null, String.class, "includedDocPaths", null, false, false, false, "String", 0, 0, null, false, null, null, null, null, null, false); + protected final ColumnInfo _columnIncludedPaths = cci("includedPaths", "includedPaths", null, null, String.class, "includedPaths", null, false, false, false, "String", 0, 0, null, false, null, null, null, null, null, false); + protected final ColumnInfo _columnIntervalTime = cci("intervalTime", "intervalTime", null, null, Integer.class, "intervalTime", null, false, false, false, "Integer", 0, 0, null, false, null, null, null, null, null, false); + protected final ColumnInfo _columnTimeToLive = cci("timeToLive", "timeToLive", null, null, Integer.class, "timeToLive", null, false, false, false, "Integer", 0, 0, null, false, null, null, null, null, null, false); + protected final ColumnInfo _columnMaxAccessCount = cci("maxAccessCount", "maxAccessCount", null, null, Long.class, "maxAccessCount", null, false, false, false, "Long", 0, 0, null, false, null, null, null, null, null, false); + protected final ColumnInfo _columnName = cci("name", "name", null, null, String.class, "name", null, false, false, false, "String", 0, 0, null, false, null, null, null, null, null, false); + protected final ColumnInfo _columnNumOfThread = cci("numOfThread", "numOfThread", null, null, Integer.class, "numOfThread", null, false, false, false, "Integer", 0, 0, null, false, null, null, null, null, null, false); + protected final ColumnInfo _columnPaths = cci("paths", "paths", null, null, String.class, "paths", null, false, false, false, "String", 0, 0, null, false, null, null, null, null, null, false); + protected final ColumnInfo _columnSortOrder = cci("sortOrder", "sortOrder", null, null, Integer.class, "sortOrder", null, false, false, false, "Integer", 0, 0, null, false, null, null, null, null, null, false); + protected final ColumnInfo _columnUpdatedBy = cci("updatedBy", "updatedBy", null, null, String.class, "updatedBy", null, false, false, false, "String", 0, 0, null, false, null, null, null, null, null, false); + protected final ColumnInfo _columnUpdatedTime = cci("updatedTime", "updatedTime", null, null, Long.class, "updatedTime", null, false, false, false, "Long", 0, 0, null, false, null, null, null, null, null, false); - public ColumnInfo columnAvailable() { - return _columnAvailable; - } - - public ColumnInfo columnBoost() { - return _columnBoost; - } - - public ColumnInfo columnConfigParameter() { - return _columnConfigParameter; - } - - public ColumnInfo columnCreatedBy() { - return _columnCreatedBy; - } - - public ColumnInfo columnCreatedTime() { - return _columnCreatedTime; - } - - public ColumnInfo columnDepth() { - return _columnDepth; - } - - public ColumnInfo columnExcludedDocPaths() { - return _columnExcludedDocPaths; - } - - public ColumnInfo columnExcludedPaths() { - return _columnExcludedPaths; - } - - public ColumnInfo columnIncludedDocPaths() { - return _columnIncludedDocPaths; - } - - public ColumnInfo columnIncludedPaths() { - return _columnIncludedPaths; - } - - public ColumnInfo columnIntervalTime() { - return _columnIntervalTime; - } - - public ColumnInfo columnTimeToLive() { - return _columnTimeToLive; - } - - public ColumnInfo columnMaxAccessCount() { - return _columnMaxAccessCount; - } - - public ColumnInfo columnName() { - return _columnName; - } - - public ColumnInfo columnNumOfThread() { - return _columnNumOfThread; - } - - public ColumnInfo columnPaths() { - return _columnPaths; - } - - public ColumnInfo columnSortOrder() { - return _columnSortOrder; - } - - public ColumnInfo columnUpdatedBy() { - return _columnUpdatedBy; - } - - public ColumnInfo columnUpdatedTime() { - return _columnUpdatedTime; - } + public ColumnInfo columnAvailable() { return _columnAvailable; } + public ColumnInfo columnBoost() { return _columnBoost; } + public ColumnInfo columnConfigParameter() { return _columnConfigParameter; } + public ColumnInfo columnCreatedBy() { return _columnCreatedBy; } + public ColumnInfo columnCreatedTime() { return _columnCreatedTime; } + public ColumnInfo columnDepth() { return _columnDepth; } + public ColumnInfo columnExcludedDocPaths() { return _columnExcludedDocPaths; } + public ColumnInfo columnExcludedPaths() { return _columnExcludedPaths; } + public ColumnInfo columnIncludedDocPaths() { return _columnIncludedDocPaths; } + public ColumnInfo columnIncludedPaths() { return _columnIncludedPaths; } + public ColumnInfo columnIntervalTime() { return _columnIntervalTime; } + public ColumnInfo columnTimeToLive() { return _columnTimeToLive; } + public ColumnInfo columnMaxAccessCount() { return _columnMaxAccessCount; } + public ColumnInfo columnName() { return _columnName; } + public ColumnInfo columnNumOfThread() { return _columnNumOfThread; } + public ColumnInfo columnPaths() { return _columnPaths; } + public ColumnInfo columnSortOrder() { return _columnSortOrder; } + public ColumnInfo columnUpdatedBy() { return _columnUpdatedBy; } + public ColumnInfo columnUpdatedTime() { return _columnUpdatedTime; } protected List ccil() { List ls = newArrayList(); @@ -361,3 +260,4 @@ public class FileConfigDbm extends AbstractDBMeta { return null; } } + diff --git a/src/main/java/org/codelibs/fess/es/config/bsentity/dbmeta/FileConfigToLabelDbm.java b/src/main/java/org/codelibs/fess/es/config/bsentity/dbmeta/FileConfigToLabelDbm.java index e969392f8..836d1b1e5 100644 --- a/src/main/java/org/codelibs/fess/es/config/bsentity/dbmeta/FileConfigToLabelDbm.java +++ b/src/main/java/org/codelibs/fess/es/config/bsentity/dbmeta/FileConfigToLabelDbm.java @@ -15,11 +15,12 @@ */ package org.codelibs.fess.es.config.bsentity.dbmeta; -import java.time.LocalDateTime; +import java.time.*; import java.util.List; import java.util.Map; import org.codelibs.fess.es.config.exentity.FileConfigToLabel; + import org.dbflute.Entity; import org.dbflute.dbmeta.AbstractDBMeta; import org.dbflute.dbmeta.info.ColumnInfo; @@ -79,10 +80,8 @@ public class FileConfigToLabelDbm extends AbstractDBMeta { // --------------- protected final Map _epgMap = newHashMap(); { - setupEpg(_epgMap, et -> ((FileConfigToLabel) et).getFileConfigId(), - (et, vl) -> ((FileConfigToLabel) et).setFileConfigId(DfTypeUtil.toString(vl)), "fileConfigId"); - setupEpg(_epgMap, et -> ((FileConfigToLabel) et).getLabelTypeId(), - (et, vl) -> ((FileConfigToLabel) et).setLabelTypeId(DfTypeUtil.toString(vl)), "labelTypeId"); + setupEpg(_epgMap, et-> ((FileConfigToLabel)et).getFileConfigId(),(et,vl)->((FileConfigToLabel) et).setFileConfigId(DfTypeUtil.toString(vl)), "fileConfigId"); + setupEpg(_epgMap, et-> ((FileConfigToLabel)et).getLabelTypeId(),(et,vl)->((FileConfigToLabel) et).setLabelTypeId(DfTypeUtil.toString(vl)), "labelTypeId"); } @Override @@ -96,41 +95,22 @@ public class FileConfigToLabelDbm extends AbstractDBMeta { protected final String _tableDbName = "file_config_to_label"; protected final String _tableDispName = "file_config_to_label"; protected final String _tablePropertyName = "FileConfigToLabel"; - - public String getTableDbName() { - return _tableDbName; - } - + public String getTableDbName() { return _tableDbName; } @Override - public String getTableDispName() { - return _tableDispName; - } - + public String getTableDispName() { return _tableDispName; } @Override - public String getTablePropertyName() { - return _tablePropertyName; - } - + public String getTablePropertyName() { return _tablePropertyName; } @Override - public TableSqlName getTableSqlName() { - return null; - } + public TableSqlName getTableSqlName() { return null; } // =================================================================================== // Column Info // =========== - protected final ColumnInfo _columnFileConfigId = cci("fileConfigId", "fileConfigId", null, null, String.class, "fileConfigId", null, - false, false, false, "String", 0, 0, null, false, null, null, null, null, null, false); - protected final ColumnInfo _columnLabelTypeId = cci("labelTypeId", "labelTypeId", null, null, String.class, "labelTypeId", null, false, - false, false, "String", 0, 0, null, false, null, null, null, null, null, false); + protected final ColumnInfo _columnFileConfigId = cci("fileConfigId", "fileConfigId", null, null, String.class, "fileConfigId", null, false, false, false, "String", 0, 0, null, false, null, null, null, null, null, false); + protected final ColumnInfo _columnLabelTypeId = cci("labelTypeId", "labelTypeId", null, null, String.class, "labelTypeId", null, false, false, false, "String", 0, 0, null, false, null, null, null, null, null, false); - public ColumnInfo columnFileConfigId() { - return _columnFileConfigId; - } - - public ColumnInfo columnLabelTypeId() { - return _columnLabelTypeId; - } + public ColumnInfo columnFileConfigId() { return _columnFileConfigId; } + public ColumnInfo columnLabelTypeId() { return _columnLabelTypeId; } protected List ccil() { List ls = newArrayList(); @@ -212,3 +192,4 @@ public class FileConfigToLabelDbm extends AbstractDBMeta { return null; } } + diff --git a/src/main/java/org/codelibs/fess/es/config/bsentity/dbmeta/FileConfigToRoleDbm.java b/src/main/java/org/codelibs/fess/es/config/bsentity/dbmeta/FileConfigToRoleDbm.java index 22165b556..51a9461da 100644 --- a/src/main/java/org/codelibs/fess/es/config/bsentity/dbmeta/FileConfigToRoleDbm.java +++ b/src/main/java/org/codelibs/fess/es/config/bsentity/dbmeta/FileConfigToRoleDbm.java @@ -15,11 +15,12 @@ */ package org.codelibs.fess.es.config.bsentity.dbmeta; -import java.time.LocalDateTime; +import java.time.*; import java.util.List; import java.util.Map; import org.codelibs.fess.es.config.exentity.FileConfigToRole; + import org.dbflute.Entity; import org.dbflute.dbmeta.AbstractDBMeta; import org.dbflute.dbmeta.info.ColumnInfo; @@ -79,10 +80,8 @@ public class FileConfigToRoleDbm extends AbstractDBMeta { // --------------- protected final Map _epgMap = newHashMap(); { - setupEpg(_epgMap, et -> ((FileConfigToRole) et).getFileConfigId(), - (et, vl) -> ((FileConfigToRole) et).setFileConfigId(DfTypeUtil.toString(vl)), "fileConfigId"); - setupEpg(_epgMap, et -> ((FileConfigToRole) et).getRoleTypeId(), - (et, vl) -> ((FileConfigToRole) et).setRoleTypeId(DfTypeUtil.toString(vl)), "roleTypeId"); + setupEpg(_epgMap, et-> ((FileConfigToRole)et).getFileConfigId(),(et,vl)->((FileConfigToRole) et).setFileConfigId(DfTypeUtil.toString(vl)), "fileConfigId"); + setupEpg(_epgMap, et-> ((FileConfigToRole)et).getRoleTypeId(),(et,vl)->((FileConfigToRole) et).setRoleTypeId(DfTypeUtil.toString(vl)), "roleTypeId"); } @Override @@ -96,41 +95,22 @@ public class FileConfigToRoleDbm extends AbstractDBMeta { protected final String _tableDbName = "file_config_to_role"; protected final String _tableDispName = "file_config_to_role"; protected final String _tablePropertyName = "FileConfigToRole"; - - public String getTableDbName() { - return _tableDbName; - } - + public String getTableDbName() { return _tableDbName; } @Override - public String getTableDispName() { - return _tableDispName; - } - + public String getTableDispName() { return _tableDispName; } @Override - public String getTablePropertyName() { - return _tablePropertyName; - } - + public String getTablePropertyName() { return _tablePropertyName; } @Override - public TableSqlName getTableSqlName() { - return null; - } + public TableSqlName getTableSqlName() { return null; } // =================================================================================== // Column Info // =========== - protected final ColumnInfo _columnFileConfigId = cci("fileConfigId", "fileConfigId", null, null, String.class, "fileConfigId", null, - false, false, false, "String", 0, 0, null, false, null, null, null, null, null, false); - protected final ColumnInfo _columnRoleTypeId = cci("roleTypeId", "roleTypeId", null, null, String.class, "roleTypeId", null, false, - false, false, "String", 0, 0, null, false, null, null, null, null, null, false); + protected final ColumnInfo _columnFileConfigId = cci("fileConfigId", "fileConfigId", null, null, String.class, "fileConfigId", null, false, false, false, "String", 0, 0, null, false, null, null, null, null, null, false); + protected final ColumnInfo _columnRoleTypeId = cci("roleTypeId", "roleTypeId", null, null, String.class, "roleTypeId", null, false, false, false, "String", 0, 0, null, false, null, null, null, null, null, false); - public ColumnInfo columnFileConfigId() { - return _columnFileConfigId; - } - - public ColumnInfo columnRoleTypeId() { - return _columnRoleTypeId; - } + public ColumnInfo columnFileConfigId() { return _columnFileConfigId; } + public ColumnInfo columnRoleTypeId() { return _columnRoleTypeId; } protected List ccil() { List ls = newArrayList(); @@ -212,3 +192,4 @@ public class FileConfigToRoleDbm extends AbstractDBMeta { return null; } } + diff --git a/src/main/java/org/codelibs/fess/es/config/bsentity/dbmeta/JobLogDbm.java b/src/main/java/org/codelibs/fess/es/config/bsentity/dbmeta/JobLogDbm.java index 6af58ca00..d26b6585e 100644 --- a/src/main/java/org/codelibs/fess/es/config/bsentity/dbmeta/JobLogDbm.java +++ b/src/main/java/org/codelibs/fess/es/config/bsentity/dbmeta/JobLogDbm.java @@ -15,11 +15,12 @@ */ package org.codelibs.fess.es.config.bsentity.dbmeta; -import java.time.LocalDateTime; +import java.time.*; import java.util.List; import java.util.Map; import org.codelibs.fess.es.config.exentity.JobLog; + import org.dbflute.Entity; import org.dbflute.dbmeta.AbstractDBMeta; import org.dbflute.dbmeta.info.ColumnInfo; @@ -79,17 +80,14 @@ public class JobLogDbm extends AbstractDBMeta { // --------------- protected final Map _epgMap = newHashMap(); { - setupEpg(_epgMap, et -> ((JobLog) et).getEndTime(), (et, vl) -> ((JobLog) et).setEndTime(DfTypeUtil.toLong(vl)), "endTime"); - setupEpg(_epgMap, et -> ((JobLog) et).getJobName(), (et, vl) -> ((JobLog) et).setJobName(DfTypeUtil.toString(vl)), "jobName"); - setupEpg(_epgMap, et -> ((JobLog) et).getJobStatus(), (et, vl) -> ((JobLog) et).setJobStatus(DfTypeUtil.toString(vl)), "jobStatus"); - setupEpg(_epgMap, et -> ((JobLog) et).getScriptData(), (et, vl) -> ((JobLog) et).setScriptData(DfTypeUtil.toString(vl)), - "scriptData"); - setupEpg(_epgMap, et -> ((JobLog) et).getScriptResult(), (et, vl) -> ((JobLog) et).setScriptResult(DfTypeUtil.toString(vl)), - "scriptResult"); - setupEpg(_epgMap, et -> ((JobLog) et).getScriptType(), (et, vl) -> ((JobLog) et).setScriptType(DfTypeUtil.toString(vl)), - "scriptType"); - setupEpg(_epgMap, et -> ((JobLog) et).getStartTime(), (et, vl) -> ((JobLog) et).setStartTime(DfTypeUtil.toLong(vl)), "startTime"); - setupEpg(_epgMap, et -> ((JobLog) et).getTarget(), (et, vl) -> ((JobLog) et).setTarget(DfTypeUtil.toString(vl)), "target"); + setupEpg(_epgMap, et-> ((JobLog)et).getEndTime(),(et,vl)->((JobLog) et).setEndTime(DfTypeUtil.toLong(vl)), "endTime"); + setupEpg(_epgMap, et-> ((JobLog)et).getJobName(),(et,vl)->((JobLog) et).setJobName(DfTypeUtil.toString(vl)), "jobName"); + setupEpg(_epgMap, et-> ((JobLog)et).getJobStatus(),(et,vl)->((JobLog) et).setJobStatus(DfTypeUtil.toString(vl)), "jobStatus"); + setupEpg(_epgMap, et-> ((JobLog)et).getScriptData(),(et,vl)->((JobLog) et).setScriptData(DfTypeUtil.toString(vl)), "scriptData"); + setupEpg(_epgMap, et-> ((JobLog)et).getScriptResult(),(et,vl)->((JobLog) et).setScriptResult(DfTypeUtil.toString(vl)), "scriptResult"); + setupEpg(_epgMap, et-> ((JobLog)et).getScriptType(),(et,vl)->((JobLog) et).setScriptType(DfTypeUtil.toString(vl)), "scriptType"); + setupEpg(_epgMap, et-> ((JobLog)et).getStartTime(),(et,vl)->((JobLog) et).setStartTime(DfTypeUtil.toLong(vl)), "startTime"); + setupEpg(_epgMap, et-> ((JobLog)et).getTarget(),(et,vl)->((JobLog) et).setTarget(DfTypeUtil.toString(vl)), "target"); } @Override @@ -103,77 +101,34 @@ public class JobLogDbm extends AbstractDBMeta { protected final String _tableDbName = "job_log"; protected final String _tableDispName = "job_log"; protected final String _tablePropertyName = "JobLog"; - - public String getTableDbName() { - return _tableDbName; - } - + public String getTableDbName() { return _tableDbName; } @Override - public String getTableDispName() { - return _tableDispName; - } - + public String getTableDispName() { return _tableDispName; } @Override - public String getTablePropertyName() { - return _tablePropertyName; - } - + public String getTablePropertyName() { return _tablePropertyName; } @Override - public TableSqlName getTableSqlName() { - return null; - } + public TableSqlName getTableSqlName() { return null; } // =================================================================================== // Column Info // =========== - protected final ColumnInfo _columnEndTime = cci("endTime", "endTime", null, null, Long.class, "endTime", null, false, false, false, - "Long", 0, 0, null, false, null, null, null, null, null, false); - protected final ColumnInfo _columnJobName = cci("jobName", "jobName", null, null, String.class, "jobName", null, false, false, false, - "String", 0, 0, null, false, null, null, null, null, null, false); - protected final ColumnInfo _columnJobStatus = cci("jobStatus", "jobStatus", null, null, String.class, "jobStatus", null, false, false, - false, "String", 0, 0, null, false, null, null, null, null, null, false); - protected final ColumnInfo _columnScriptData = cci("scriptData", "scriptData", null, null, String.class, "scriptData", null, false, - false, false, "String", 0, 0, null, false, null, null, null, null, null, false); - protected final ColumnInfo _columnScriptResult = cci("scriptResult", "scriptResult", null, null, String.class, "scriptResult", null, - false, false, false, "String", 0, 0, null, false, null, null, null, null, null, false); - protected final ColumnInfo _columnScriptType = cci("scriptType", "scriptType", null, null, String.class, "scriptType", null, false, - false, false, "String", 0, 0, null, false, null, null, null, null, null, false); - protected final ColumnInfo _columnStartTime = cci("startTime", "startTime", null, null, Long.class, "startTime", null, false, false, - false, "Long", 0, 0, null, false, null, null, null, null, null, false); - protected final ColumnInfo _columnTarget = cci("target", "target", null, null, String.class, "target", null, false, false, false, - "String", 0, 0, null, false, null, null, null, null, null, false); + protected final ColumnInfo _columnEndTime = cci("endTime", "endTime", null, null, Long.class, "endTime", null, false, false, false, "Long", 0, 0, null, false, null, null, null, null, null, false); + protected final ColumnInfo _columnJobName = cci("jobName", "jobName", null, null, String.class, "jobName", null, false, false, false, "String", 0, 0, null, false, null, null, null, null, null, false); + protected final ColumnInfo _columnJobStatus = cci("jobStatus", "jobStatus", null, null, String.class, "jobStatus", null, false, false, false, "String", 0, 0, null, false, null, null, null, null, null, false); + protected final ColumnInfo _columnScriptData = cci("scriptData", "scriptData", null, null, String.class, "scriptData", null, false, false, false, "String", 0, 0, null, false, null, null, null, null, null, false); + protected final ColumnInfo _columnScriptResult = cci("scriptResult", "scriptResult", null, null, String.class, "scriptResult", null, false, false, false, "String", 0, 0, null, false, null, null, null, null, null, false); + protected final ColumnInfo _columnScriptType = cci("scriptType", "scriptType", null, null, String.class, "scriptType", null, false, false, false, "String", 0, 0, null, false, null, null, null, null, null, false); + protected final ColumnInfo _columnStartTime = cci("startTime", "startTime", null, null, Long.class, "startTime", null, false, false, false, "Long", 0, 0, null, false, null, null, null, null, null, false); + protected final ColumnInfo _columnTarget = cci("target", "target", null, null, String.class, "target", null, false, false, false, "String", 0, 0, null, false, null, null, null, null, null, false); - public ColumnInfo columnEndTime() { - return _columnEndTime; - } - - public ColumnInfo columnJobName() { - return _columnJobName; - } - - public ColumnInfo columnJobStatus() { - return _columnJobStatus; - } - - public ColumnInfo columnScriptData() { - return _columnScriptData; - } - - public ColumnInfo columnScriptResult() { - return _columnScriptResult; - } - - public ColumnInfo columnScriptType() { - return _columnScriptType; - } - - public ColumnInfo columnStartTime() { - return _columnStartTime; - } - - public ColumnInfo columnTarget() { - return _columnTarget; - } + public ColumnInfo columnEndTime() { return _columnEndTime; } + public ColumnInfo columnJobName() { return _columnJobName; } + public ColumnInfo columnJobStatus() { return _columnJobStatus; } + public ColumnInfo columnScriptData() { return _columnScriptData; } + public ColumnInfo columnScriptResult() { return _columnScriptResult; } + public ColumnInfo columnScriptType() { return _columnScriptType; } + public ColumnInfo columnStartTime() { return _columnStartTime; } + public ColumnInfo columnTarget() { return _columnTarget; } protected List ccil() { List ls = newArrayList(); @@ -261,3 +216,4 @@ public class JobLogDbm extends AbstractDBMeta { return null; } } + diff --git a/src/main/java/org/codelibs/fess/es/config/bsentity/dbmeta/KeyMatchDbm.java b/src/main/java/org/codelibs/fess/es/config/bsentity/dbmeta/KeyMatchDbm.java index 193ab6d95..860a2b9c2 100644 --- a/src/main/java/org/codelibs/fess/es/config/bsentity/dbmeta/KeyMatchDbm.java +++ b/src/main/java/org/codelibs/fess/es/config/bsentity/dbmeta/KeyMatchDbm.java @@ -15,11 +15,12 @@ */ package org.codelibs.fess.es.config.bsentity.dbmeta; -import java.time.LocalDateTime; +import java.time.*; import java.util.List; import java.util.Map; import org.codelibs.fess.es.config.exentity.KeyMatch; + import org.dbflute.Entity; import org.dbflute.dbmeta.AbstractDBMeta; import org.dbflute.dbmeta.info.ColumnInfo; @@ -79,18 +80,14 @@ public class KeyMatchDbm extends AbstractDBMeta { // --------------- protected final Map _epgMap = newHashMap(); { - setupEpg(_epgMap, et -> ((KeyMatch) et).getBoost(), (et, vl) -> ((KeyMatch) et).setBoost(DfTypeUtil.toFloat(vl)), "boost"); - setupEpg(_epgMap, et -> ((KeyMatch) et).getCreatedBy(), (et, vl) -> ((KeyMatch) et).setCreatedBy(DfTypeUtil.toString(vl)), - "createdBy"); - setupEpg(_epgMap, et -> ((KeyMatch) et).getCreatedTime(), (et, vl) -> ((KeyMatch) et).setCreatedTime(DfTypeUtil.toLong(vl)), - "createdTime"); - setupEpg(_epgMap, et -> ((KeyMatch) et).getMaxSize(), (et, vl) -> ((KeyMatch) et).setMaxSize(DfTypeUtil.toInteger(vl)), "maxSize"); - setupEpg(_epgMap, et -> ((KeyMatch) et).getQuery(), (et, vl) -> ((KeyMatch) et).setQuery(DfTypeUtil.toString(vl)), "query"); - setupEpg(_epgMap, et -> ((KeyMatch) et).getTerm(), (et, vl) -> ((KeyMatch) et).setTerm(DfTypeUtil.toString(vl)), "term"); - setupEpg(_epgMap, et -> ((KeyMatch) et).getUpdatedBy(), (et, vl) -> ((KeyMatch) et).setUpdatedBy(DfTypeUtil.toString(vl)), - "updatedBy"); - setupEpg(_epgMap, et -> ((KeyMatch) et).getUpdatedTime(), (et, vl) -> ((KeyMatch) et).setUpdatedTime(DfTypeUtil.toLong(vl)), - "updatedTime"); + setupEpg(_epgMap, et-> ((KeyMatch)et).getBoost(),(et,vl)->((KeyMatch) et).setBoost(DfTypeUtil.toFloat(vl)), "boost"); + setupEpg(_epgMap, et-> ((KeyMatch)et).getCreatedBy(),(et,vl)->((KeyMatch) et).setCreatedBy(DfTypeUtil.toString(vl)), "createdBy"); + setupEpg(_epgMap, et-> ((KeyMatch)et).getCreatedTime(),(et,vl)->((KeyMatch) et).setCreatedTime(DfTypeUtil.toLong(vl)), "createdTime"); + setupEpg(_epgMap, et-> ((KeyMatch)et).getMaxSize(),(et,vl)->((KeyMatch) et).setMaxSize(DfTypeUtil.toInteger(vl)), "maxSize"); + setupEpg(_epgMap, et-> ((KeyMatch)et).getQuery(),(et,vl)->((KeyMatch) et).setQuery(DfTypeUtil.toString(vl)), "query"); + setupEpg(_epgMap, et-> ((KeyMatch)et).getTerm(),(et,vl)->((KeyMatch) et).setTerm(DfTypeUtil.toString(vl)), "term"); + setupEpg(_epgMap, et-> ((KeyMatch)et).getUpdatedBy(),(et,vl)->((KeyMatch) et).setUpdatedBy(DfTypeUtil.toString(vl)), "updatedBy"); + setupEpg(_epgMap, et-> ((KeyMatch)et).getUpdatedTime(),(et,vl)->((KeyMatch) et).setUpdatedTime(DfTypeUtil.toLong(vl)), "updatedTime"); } @Override @@ -104,77 +101,34 @@ public class KeyMatchDbm extends AbstractDBMeta { protected final String _tableDbName = "key_match"; protected final String _tableDispName = "key_match"; protected final String _tablePropertyName = "KeyMatch"; - - public String getTableDbName() { - return _tableDbName; - } - + public String getTableDbName() { return _tableDbName; } @Override - public String getTableDispName() { - return _tableDispName; - } - + public String getTableDispName() { return _tableDispName; } @Override - public String getTablePropertyName() { - return _tablePropertyName; - } - + public String getTablePropertyName() { return _tablePropertyName; } @Override - public TableSqlName getTableSqlName() { - return null; - } + public TableSqlName getTableSqlName() { return null; } // =================================================================================== // Column Info // =========== - protected final ColumnInfo _columnBoost = cci("boost", "boost", null, null, Float.class, "boost", null, false, false, false, "Float", - 0, 0, null, false, null, null, null, null, null, false); - protected final ColumnInfo _columnCreatedBy = cci("createdBy", "createdBy", null, null, String.class, "createdBy", null, false, false, - false, "String", 0, 0, null, false, null, null, null, null, null, false); - protected final ColumnInfo _columnCreatedTime = cci("createdTime", "createdTime", null, null, Long.class, "createdTime", null, false, - false, false, "Long", 0, 0, null, false, null, null, null, null, null, false); - protected final ColumnInfo _columnMaxSize = cci("maxSize", "maxSize", null, null, Integer.class, "maxSize", null, false, false, false, - "Integer", 0, 0, null, false, null, null, null, null, null, false); - protected final ColumnInfo _columnQuery = cci("query", "query", null, null, String.class, "query", null, false, false, false, "String", - 0, 0, null, false, null, null, null, null, null, false); - protected final ColumnInfo _columnTerm = cci("term", "term", null, null, String.class, "term", null, false, false, false, "String", 0, - 0, null, false, null, null, null, null, null, false); - protected final ColumnInfo _columnUpdatedBy = cci("updatedBy", "updatedBy", null, null, String.class, "updatedBy", null, false, false, - false, "String", 0, 0, null, false, null, null, null, null, null, false); - protected final ColumnInfo _columnUpdatedTime = cci("updatedTime", "updatedTime", null, null, Long.class, "updatedTime", null, false, - false, false, "Long", 0, 0, null, false, null, null, null, null, null, false); + protected final ColumnInfo _columnBoost = cci("boost", "boost", null, null, Float.class, "boost", null, false, false, false, "Float", 0, 0, null, false, null, null, null, null, null, false); + protected final ColumnInfo _columnCreatedBy = cci("createdBy", "createdBy", null, null, String.class, "createdBy", null, false, false, false, "String", 0, 0, null, false, null, null, null, null, null, false); + protected final ColumnInfo _columnCreatedTime = cci("createdTime", "createdTime", null, null, Long.class, "createdTime", null, false, false, false, "Long", 0, 0, null, false, null, null, null, null, null, false); + protected final ColumnInfo _columnMaxSize = cci("maxSize", "maxSize", null, null, Integer.class, "maxSize", null, false, false, false, "Integer", 0, 0, null, false, null, null, null, null, null, false); + protected final ColumnInfo _columnQuery = cci("query", "query", null, null, String.class, "query", null, false, false, false, "String", 0, 0, null, false, null, null, null, null, null, false); + protected final ColumnInfo _columnTerm = cci("term", "term", null, null, String.class, "term", null, false, false, false, "String", 0, 0, null, false, null, null, null, null, null, false); + protected final ColumnInfo _columnUpdatedBy = cci("updatedBy", "updatedBy", null, null, String.class, "updatedBy", null, false, false, false, "String", 0, 0, null, false, null, null, null, null, null, false); + protected final ColumnInfo _columnUpdatedTime = cci("updatedTime", "updatedTime", null, null, Long.class, "updatedTime", null, false, false, false, "Long", 0, 0, null, false, null, null, null, null, null, false); - public ColumnInfo columnBoost() { - return _columnBoost; - } - - public ColumnInfo columnCreatedBy() { - return _columnCreatedBy; - } - - public ColumnInfo columnCreatedTime() { - return _columnCreatedTime; - } - - public ColumnInfo columnMaxSize() { - return _columnMaxSize; - } - - public ColumnInfo columnQuery() { - return _columnQuery; - } - - public ColumnInfo columnTerm() { - return _columnTerm; - } - - public ColumnInfo columnUpdatedBy() { - return _columnUpdatedBy; - } - - public ColumnInfo columnUpdatedTime() { - return _columnUpdatedTime; - } + public ColumnInfo columnBoost() { return _columnBoost; } + public ColumnInfo columnCreatedBy() { return _columnCreatedBy; } + public ColumnInfo columnCreatedTime() { return _columnCreatedTime; } + public ColumnInfo columnMaxSize() { return _columnMaxSize; } + public ColumnInfo columnQuery() { return _columnQuery; } + public ColumnInfo columnTerm() { return _columnTerm; } + public ColumnInfo columnUpdatedBy() { return _columnUpdatedBy; } + public ColumnInfo columnUpdatedTime() { return _columnUpdatedTime; } protected List ccil() { List ls = newArrayList(); @@ -262,3 +216,4 @@ public class KeyMatchDbm extends AbstractDBMeta { return null; } } + diff --git a/src/main/java/org/codelibs/fess/es/config/bsentity/dbmeta/LabelToRoleDbm.java b/src/main/java/org/codelibs/fess/es/config/bsentity/dbmeta/LabelToRoleDbm.java index f0ee70f82..e6a26be37 100644 --- a/src/main/java/org/codelibs/fess/es/config/bsentity/dbmeta/LabelToRoleDbm.java +++ b/src/main/java/org/codelibs/fess/es/config/bsentity/dbmeta/LabelToRoleDbm.java @@ -15,11 +15,12 @@ */ package org.codelibs.fess.es.config.bsentity.dbmeta; -import java.time.LocalDateTime; +import java.time.*; import java.util.List; import java.util.Map; import org.codelibs.fess.es.config.exentity.LabelToRole; + import org.dbflute.Entity; import org.dbflute.dbmeta.AbstractDBMeta; import org.dbflute.dbmeta.info.ColumnInfo; @@ -79,10 +80,8 @@ public class LabelToRoleDbm extends AbstractDBMeta { // --------------- protected final Map _epgMap = newHashMap(); { - setupEpg(_epgMap, et -> ((LabelToRole) et).getLabelTypeId(), - (et, vl) -> ((LabelToRole) et).setLabelTypeId(DfTypeUtil.toString(vl)), "labelTypeId"); - setupEpg(_epgMap, et -> ((LabelToRole) et).getRoleTypeId(), (et, vl) -> ((LabelToRole) et).setRoleTypeId(DfTypeUtil.toString(vl)), - "roleTypeId"); + setupEpg(_epgMap, et-> ((LabelToRole)et).getLabelTypeId(),(et,vl)->((LabelToRole) et).setLabelTypeId(DfTypeUtil.toString(vl)), "labelTypeId"); + setupEpg(_epgMap, et-> ((LabelToRole)et).getRoleTypeId(),(et,vl)->((LabelToRole) et).setRoleTypeId(DfTypeUtil.toString(vl)), "roleTypeId"); } @Override @@ -96,41 +95,22 @@ public class LabelToRoleDbm extends AbstractDBMeta { protected final String _tableDbName = "label_to_role"; protected final String _tableDispName = "label_to_role"; protected final String _tablePropertyName = "LabelToRole"; - - public String getTableDbName() { - return _tableDbName; - } - + public String getTableDbName() { return _tableDbName; } @Override - public String getTableDispName() { - return _tableDispName; - } - + public String getTableDispName() { return _tableDispName; } @Override - public String getTablePropertyName() { - return _tablePropertyName; - } - + public String getTablePropertyName() { return _tablePropertyName; } @Override - public TableSqlName getTableSqlName() { - return null; - } + public TableSqlName getTableSqlName() { return null; } // =================================================================================== // Column Info // =========== - protected final ColumnInfo _columnLabelTypeId = cci("labelTypeId", "labelTypeId", null, null, String.class, "labelTypeId", null, false, - false, false, "String", 0, 0, null, false, null, null, null, null, null, false); - protected final ColumnInfo _columnRoleTypeId = cci("roleTypeId", "roleTypeId", null, null, String.class, "roleTypeId", null, false, - false, false, "String", 0, 0, null, false, null, null, null, null, null, false); + protected final ColumnInfo _columnLabelTypeId = cci("labelTypeId", "labelTypeId", null, null, String.class, "labelTypeId", null, false, false, false, "String", 0, 0, null, false, null, null, null, null, null, false); + protected final ColumnInfo _columnRoleTypeId = cci("roleTypeId", "roleTypeId", null, null, String.class, "roleTypeId", null, false, false, false, "String", 0, 0, null, false, null, null, null, null, null, false); - public ColumnInfo columnLabelTypeId() { - return _columnLabelTypeId; - } - - public ColumnInfo columnRoleTypeId() { - return _columnRoleTypeId; - } + public ColumnInfo columnLabelTypeId() { return _columnLabelTypeId; } + public ColumnInfo columnRoleTypeId() { return _columnRoleTypeId; } protected List ccil() { List ls = newArrayList(); @@ -212,3 +192,4 @@ public class LabelToRoleDbm extends AbstractDBMeta { return null; } } + diff --git a/src/main/java/org/codelibs/fess/es/config/bsentity/dbmeta/LabelTypeDbm.java b/src/main/java/org/codelibs/fess/es/config/bsentity/dbmeta/LabelTypeDbm.java index d9ba285b0..281ebe677 100644 --- a/src/main/java/org/codelibs/fess/es/config/bsentity/dbmeta/LabelTypeDbm.java +++ b/src/main/java/org/codelibs/fess/es/config/bsentity/dbmeta/LabelTypeDbm.java @@ -15,11 +15,12 @@ */ package org.codelibs.fess.es.config.bsentity.dbmeta; -import java.time.LocalDateTime; +import java.time.*; import java.util.List; import java.util.Map; import org.codelibs.fess.es.config.exentity.LabelType; + import org.dbflute.Entity; import org.dbflute.dbmeta.AbstractDBMeta; import org.dbflute.dbmeta.info.ColumnInfo; @@ -79,22 +80,15 @@ public class LabelTypeDbm extends AbstractDBMeta { // --------------- protected final Map _epgMap = newHashMap(); { - setupEpg(_epgMap, et -> ((LabelType) et).getCreatedBy(), (et, vl) -> ((LabelType) et).setCreatedBy(DfTypeUtil.toString(vl)), - "createdBy"); - setupEpg(_epgMap, et -> ((LabelType) et).getCreatedTime(), (et, vl) -> ((LabelType) et).setCreatedTime(DfTypeUtil.toLong(vl)), - "createdTime"); - setupEpg(_epgMap, et -> ((LabelType) et).getExcludedPaths(), - (et, vl) -> ((LabelType) et).setExcludedPaths(DfTypeUtil.toString(vl)), "excludedPaths"); - setupEpg(_epgMap, et -> ((LabelType) et).getIncludedPaths(), - (et, vl) -> ((LabelType) et).setIncludedPaths(DfTypeUtil.toString(vl)), "includedPaths"); - setupEpg(_epgMap, et -> ((LabelType) et).getName(), (et, vl) -> ((LabelType) et).setName(DfTypeUtil.toString(vl)), "name"); - setupEpg(_epgMap, et -> ((LabelType) et).getSortOrder(), (et, vl) -> ((LabelType) et).setSortOrder(DfTypeUtil.toInteger(vl)), - "sortOrder"); - setupEpg(_epgMap, et -> ((LabelType) et).getUpdatedBy(), (et, vl) -> ((LabelType) et).setUpdatedBy(DfTypeUtil.toString(vl)), - "updatedBy"); - setupEpg(_epgMap, et -> ((LabelType) et).getUpdatedTime(), (et, vl) -> ((LabelType) et).setUpdatedTime(DfTypeUtil.toLong(vl)), - "updatedTime"); - setupEpg(_epgMap, et -> ((LabelType) et).getValue(), (et, vl) -> ((LabelType) et).setValue(DfTypeUtil.toString(vl)), "value"); + setupEpg(_epgMap, et-> ((LabelType)et).getCreatedBy(),(et,vl)->((LabelType) et).setCreatedBy(DfTypeUtil.toString(vl)), "createdBy"); + setupEpg(_epgMap, et-> ((LabelType)et).getCreatedTime(),(et,vl)->((LabelType) et).setCreatedTime(DfTypeUtil.toLong(vl)), "createdTime"); + setupEpg(_epgMap, et-> ((LabelType)et).getExcludedPaths(),(et,vl)->((LabelType) et).setExcludedPaths(DfTypeUtil.toString(vl)), "excludedPaths"); + setupEpg(_epgMap, et-> ((LabelType)et).getIncludedPaths(),(et,vl)->((LabelType) et).setIncludedPaths(DfTypeUtil.toString(vl)), "includedPaths"); + setupEpg(_epgMap, et-> ((LabelType)et).getName(),(et,vl)->((LabelType) et).setName(DfTypeUtil.toString(vl)), "name"); + setupEpg(_epgMap, et-> ((LabelType)et).getSortOrder(),(et,vl)->((LabelType) et).setSortOrder(DfTypeUtil.toInteger(vl)), "sortOrder"); + setupEpg(_epgMap, et-> ((LabelType)et).getUpdatedBy(),(et,vl)->((LabelType) et).setUpdatedBy(DfTypeUtil.toString(vl)), "updatedBy"); + setupEpg(_epgMap, et-> ((LabelType)et).getUpdatedTime(),(et,vl)->((LabelType) et).setUpdatedTime(DfTypeUtil.toLong(vl)), "updatedTime"); + setupEpg(_epgMap, et-> ((LabelType)et).getValue(),(et,vl)->((LabelType) et).setValue(DfTypeUtil.toString(vl)), "value"); } @Override @@ -108,83 +102,36 @@ public class LabelTypeDbm extends AbstractDBMeta { protected final String _tableDbName = "label_type"; protected final String _tableDispName = "label_type"; protected final String _tablePropertyName = "LabelType"; - - public String getTableDbName() { - return _tableDbName; - } - + public String getTableDbName() { return _tableDbName; } @Override - public String getTableDispName() { - return _tableDispName; - } - + public String getTableDispName() { return _tableDispName; } @Override - public String getTablePropertyName() { - return _tablePropertyName; - } - + public String getTablePropertyName() { return _tablePropertyName; } @Override - public TableSqlName getTableSqlName() { - return null; - } + public TableSqlName getTableSqlName() { return null; } // =================================================================================== // Column Info // =========== - protected final ColumnInfo _columnCreatedBy = cci("createdBy", "createdBy", null, null, String.class, "createdBy", null, false, false, - false, "String", 0, 0, null, false, null, null, null, null, null, false); - protected final ColumnInfo _columnCreatedTime = cci("createdTime", "createdTime", null, null, Long.class, "createdTime", null, false, - false, false, "Long", 0, 0, null, false, null, null, null, null, null, false); - protected final ColumnInfo _columnExcludedPaths = cci("excludedPaths", "excludedPaths", null, null, String.class, "excludedPaths", - null, false, false, false, "String", 0, 0, null, false, null, null, null, null, null, false); - protected final ColumnInfo _columnIncludedPaths = cci("includedPaths", "includedPaths", null, null, String.class, "includedPaths", - null, false, false, false, "String", 0, 0, null, false, null, null, null, null, null, false); - protected final ColumnInfo _columnName = cci("name", "name", null, null, String.class, "name", null, false, false, false, "String", 0, - 0, null, false, null, null, null, null, null, false); - protected final ColumnInfo _columnSortOrder = cci("sortOrder", "sortOrder", null, null, Integer.class, "sortOrder", null, false, false, - false, "Integer", 0, 0, null, false, null, null, null, null, null, false); - protected final ColumnInfo _columnUpdatedBy = cci("updatedBy", "updatedBy", null, null, String.class, "updatedBy", null, false, false, - false, "String", 0, 0, null, false, null, null, null, null, null, false); - protected final ColumnInfo _columnUpdatedTime = cci("updatedTime", "updatedTime", null, null, Long.class, "updatedTime", null, false, - false, false, "Long", 0, 0, null, false, null, null, null, null, null, false); - protected final ColumnInfo _columnValue = cci("value", "value", null, null, String.class, "value", null, false, false, false, "String", - 0, 0, null, false, null, null, null, null, null, false); + protected final ColumnInfo _columnCreatedBy = cci("createdBy", "createdBy", null, null, String.class, "createdBy", null, false, false, false, "String", 0, 0, null, false, null, null, null, null, null, false); + protected final ColumnInfo _columnCreatedTime = cci("createdTime", "createdTime", null, null, Long.class, "createdTime", null, false, false, false, "Long", 0, 0, null, false, null, null, null, null, null, false); + protected final ColumnInfo _columnExcludedPaths = cci("excludedPaths", "excludedPaths", null, null, String.class, "excludedPaths", null, false, false, false, "String", 0, 0, null, false, null, null, null, null, null, false); + protected final ColumnInfo _columnIncludedPaths = cci("includedPaths", "includedPaths", null, null, String.class, "includedPaths", null, false, false, false, "String", 0, 0, null, false, null, null, null, null, null, false); + protected final ColumnInfo _columnName = cci("name", "name", null, null, String.class, "name", null, false, false, false, "String", 0, 0, null, false, null, null, null, null, null, false); + protected final ColumnInfo _columnSortOrder = cci("sortOrder", "sortOrder", null, null, Integer.class, "sortOrder", null, false, false, false, "Integer", 0, 0, null, false, null, null, null, null, null, false); + protected final ColumnInfo _columnUpdatedBy = cci("updatedBy", "updatedBy", null, null, String.class, "updatedBy", null, false, false, false, "String", 0, 0, null, false, null, null, null, null, null, false); + protected final ColumnInfo _columnUpdatedTime = cci("updatedTime", "updatedTime", null, null, Long.class, "updatedTime", null, false, false, false, "Long", 0, 0, null, false, null, null, null, null, null, false); + protected final ColumnInfo _columnValue = cci("value", "value", null, null, String.class, "value", null, false, false, false, "String", 0, 0, null, false, null, null, null, null, null, false); - public ColumnInfo columnCreatedBy() { - return _columnCreatedBy; - } - - public ColumnInfo columnCreatedTime() { - return _columnCreatedTime; - } - - public ColumnInfo columnExcludedPaths() { - return _columnExcludedPaths; - } - - public ColumnInfo columnIncludedPaths() { - return _columnIncludedPaths; - } - - public ColumnInfo columnName() { - return _columnName; - } - - public ColumnInfo columnSortOrder() { - return _columnSortOrder; - } - - public ColumnInfo columnUpdatedBy() { - return _columnUpdatedBy; - } - - public ColumnInfo columnUpdatedTime() { - return _columnUpdatedTime; - } - - public ColumnInfo columnValue() { - return _columnValue; - } + public ColumnInfo columnCreatedBy() { return _columnCreatedBy; } + public ColumnInfo columnCreatedTime() { return _columnCreatedTime; } + public ColumnInfo columnExcludedPaths() { return _columnExcludedPaths; } + public ColumnInfo columnIncludedPaths() { return _columnIncludedPaths; } + public ColumnInfo columnName() { return _columnName; } + public ColumnInfo columnSortOrder() { return _columnSortOrder; } + public ColumnInfo columnUpdatedBy() { return _columnUpdatedBy; } + public ColumnInfo columnUpdatedTime() { return _columnUpdatedTime; } + public ColumnInfo columnValue() { return _columnValue; } protected List ccil() { List ls = newArrayList(); @@ -273,3 +220,4 @@ public class LabelTypeDbm extends AbstractDBMeta { return null; } } + diff --git a/src/main/java/org/codelibs/fess/es/config/bsentity/dbmeta/PathMappingDbm.java b/src/main/java/org/codelibs/fess/es/config/bsentity/dbmeta/PathMappingDbm.java index 7eae7f605..6fc1c5e6e 100644 --- a/src/main/java/org/codelibs/fess/es/config/bsentity/dbmeta/PathMappingDbm.java +++ b/src/main/java/org/codelibs/fess/es/config/bsentity/dbmeta/PathMappingDbm.java @@ -15,11 +15,12 @@ */ package org.codelibs.fess.es.config.bsentity.dbmeta; -import java.time.LocalDateTime; +import java.time.*; import java.util.List; import java.util.Map; import org.codelibs.fess.es.config.exentity.PathMapping; + import org.dbflute.Entity; import org.dbflute.dbmeta.AbstractDBMeta; import org.dbflute.dbmeta.info.ColumnInfo; @@ -79,21 +80,14 @@ public class PathMappingDbm extends AbstractDBMeta { // --------------- protected final Map _epgMap = newHashMap(); { - setupEpg(_epgMap, et -> ((PathMapping) et).getCreatedBy(), (et, vl) -> ((PathMapping) et).setCreatedBy(DfTypeUtil.toString(vl)), - "createdBy"); - setupEpg(_epgMap, et -> ((PathMapping) et).getCreatedTime(), (et, vl) -> ((PathMapping) et).setCreatedTime(DfTypeUtil.toLong(vl)), - "createdTime"); - setupEpg(_epgMap, et -> ((PathMapping) et).getProcessType(), - (et, vl) -> ((PathMapping) et).setProcessType(DfTypeUtil.toString(vl)), "processType"); - setupEpg(_epgMap, et -> ((PathMapping) et).getRegex(), (et, vl) -> ((PathMapping) et).setRegex(DfTypeUtil.toString(vl)), "regex"); - setupEpg(_epgMap, et -> ((PathMapping) et).getReplacement(), - (et, vl) -> ((PathMapping) et).setReplacement(DfTypeUtil.toString(vl)), "replacement"); - setupEpg(_epgMap, et -> ((PathMapping) et).getSortOrder(), (et, vl) -> ((PathMapping) et).setSortOrder(DfTypeUtil.toInteger(vl)), - "sortOrder"); - setupEpg(_epgMap, et -> ((PathMapping) et).getUpdatedBy(), (et, vl) -> ((PathMapping) et).setUpdatedBy(DfTypeUtil.toString(vl)), - "updatedBy"); - setupEpg(_epgMap, et -> ((PathMapping) et).getUpdatedTime(), (et, vl) -> ((PathMapping) et).setUpdatedTime(DfTypeUtil.toLong(vl)), - "updatedTime"); + setupEpg(_epgMap, et-> ((PathMapping)et).getCreatedBy(),(et,vl)->((PathMapping) et).setCreatedBy(DfTypeUtil.toString(vl)), "createdBy"); + setupEpg(_epgMap, et-> ((PathMapping)et).getCreatedTime(),(et,vl)->((PathMapping) et).setCreatedTime(DfTypeUtil.toLong(vl)), "createdTime"); + setupEpg(_epgMap, et-> ((PathMapping)et).getProcessType(),(et,vl)->((PathMapping) et).setProcessType(DfTypeUtil.toString(vl)), "processType"); + setupEpg(_epgMap, et-> ((PathMapping)et).getRegex(),(et,vl)->((PathMapping) et).setRegex(DfTypeUtil.toString(vl)), "regex"); + setupEpg(_epgMap, et-> ((PathMapping)et).getReplacement(),(et,vl)->((PathMapping) et).setReplacement(DfTypeUtil.toString(vl)), "replacement"); + setupEpg(_epgMap, et-> ((PathMapping)et).getSortOrder(),(et,vl)->((PathMapping) et).setSortOrder(DfTypeUtil.toInteger(vl)), "sortOrder"); + setupEpg(_epgMap, et-> ((PathMapping)et).getUpdatedBy(),(et,vl)->((PathMapping) et).setUpdatedBy(DfTypeUtil.toString(vl)), "updatedBy"); + setupEpg(_epgMap, et-> ((PathMapping)et).getUpdatedTime(),(et,vl)->((PathMapping) et).setUpdatedTime(DfTypeUtil.toLong(vl)), "updatedTime"); } @Override @@ -107,77 +101,34 @@ public class PathMappingDbm extends AbstractDBMeta { protected final String _tableDbName = "path_mapping"; protected final String _tableDispName = "path_mapping"; protected final String _tablePropertyName = "PathMapping"; - - public String getTableDbName() { - return _tableDbName; - } - + public String getTableDbName() { return _tableDbName; } @Override - public String getTableDispName() { - return _tableDispName; - } - + public String getTableDispName() { return _tableDispName; } @Override - public String getTablePropertyName() { - return _tablePropertyName; - } - + public String getTablePropertyName() { return _tablePropertyName; } @Override - public TableSqlName getTableSqlName() { - return null; - } + public TableSqlName getTableSqlName() { return null; } // =================================================================================== // Column Info // =========== - protected final ColumnInfo _columnCreatedBy = cci("createdBy", "createdBy", null, null, String.class, "createdBy", null, false, false, - false, "String", 0, 0, null, false, null, null, null, null, null, false); - protected final ColumnInfo _columnCreatedTime = cci("createdTime", "createdTime", null, null, Long.class, "createdTime", null, false, - false, false, "Long", 0, 0, null, false, null, null, null, null, null, false); - protected final ColumnInfo _columnProcessType = cci("processType", "processType", null, null, String.class, "processType", null, false, - false, false, "String", 0, 0, null, false, null, null, null, null, null, false); - protected final ColumnInfo _columnRegex = cci("regex", "regex", null, null, String.class, "regex", null, false, false, false, "String", - 0, 0, null, false, null, null, null, null, null, false); - protected final ColumnInfo _columnReplacement = cci("replacement", "replacement", null, null, String.class, "replacement", null, false, - false, false, "String", 0, 0, null, false, null, null, null, null, null, false); - protected final ColumnInfo _columnSortOrder = cci("sortOrder", "sortOrder", null, null, Integer.class, "sortOrder", null, false, false, - false, "Integer", 0, 0, null, false, null, null, null, null, null, false); - protected final ColumnInfo _columnUpdatedBy = cci("updatedBy", "updatedBy", null, null, String.class, "updatedBy", null, false, false, - false, "String", 0, 0, null, false, null, null, null, null, null, false); - protected final ColumnInfo _columnUpdatedTime = cci("updatedTime", "updatedTime", null, null, Long.class, "updatedTime", null, false, - false, false, "Long", 0, 0, null, false, null, null, null, null, null, false); + protected final ColumnInfo _columnCreatedBy = cci("createdBy", "createdBy", null, null, String.class, "createdBy", null, false, false, false, "String", 0, 0, null, false, null, null, null, null, null, false); + protected final ColumnInfo _columnCreatedTime = cci("createdTime", "createdTime", null, null, Long.class, "createdTime", null, false, false, false, "Long", 0, 0, null, false, null, null, null, null, null, false); + protected final ColumnInfo _columnProcessType = cci("processType", "processType", null, null, String.class, "processType", null, false, false, false, "String", 0, 0, null, false, null, null, null, null, null, false); + protected final ColumnInfo _columnRegex = cci("regex", "regex", null, null, String.class, "regex", null, false, false, false, "String", 0, 0, null, false, null, null, null, null, null, false); + protected final ColumnInfo _columnReplacement = cci("replacement", "replacement", null, null, String.class, "replacement", null, false, false, false, "String", 0, 0, null, false, null, null, null, null, null, false); + protected final ColumnInfo _columnSortOrder = cci("sortOrder", "sortOrder", null, null, Integer.class, "sortOrder", null, false, false, false, "Integer", 0, 0, null, false, null, null, null, null, null, false); + protected final ColumnInfo _columnUpdatedBy = cci("updatedBy", "updatedBy", null, null, String.class, "updatedBy", null, false, false, false, "String", 0, 0, null, false, null, null, null, null, null, false); + protected final ColumnInfo _columnUpdatedTime = cci("updatedTime", "updatedTime", null, null, Long.class, "updatedTime", null, false, false, false, "Long", 0, 0, null, false, null, null, null, null, null, false); - public ColumnInfo columnCreatedBy() { - return _columnCreatedBy; - } - - public ColumnInfo columnCreatedTime() { - return _columnCreatedTime; - } - - public ColumnInfo columnProcessType() { - return _columnProcessType; - } - - public ColumnInfo columnRegex() { - return _columnRegex; - } - - public ColumnInfo columnReplacement() { - return _columnReplacement; - } - - public ColumnInfo columnSortOrder() { - return _columnSortOrder; - } - - public ColumnInfo columnUpdatedBy() { - return _columnUpdatedBy; - } - - public ColumnInfo columnUpdatedTime() { - return _columnUpdatedTime; - } + public ColumnInfo columnCreatedBy() { return _columnCreatedBy; } + public ColumnInfo columnCreatedTime() { return _columnCreatedTime; } + public ColumnInfo columnProcessType() { return _columnProcessType; } + public ColumnInfo columnRegex() { return _columnRegex; } + public ColumnInfo columnReplacement() { return _columnReplacement; } + public ColumnInfo columnSortOrder() { return _columnSortOrder; } + public ColumnInfo columnUpdatedBy() { return _columnUpdatedBy; } + public ColumnInfo columnUpdatedTime() { return _columnUpdatedTime; } protected List ccil() { List ls = newArrayList(); @@ -265,3 +216,4 @@ public class PathMappingDbm extends AbstractDBMeta { return null; } } + diff --git a/src/main/java/org/codelibs/fess/es/config/bsentity/dbmeta/RequestHeaderDbm.java b/src/main/java/org/codelibs/fess/es/config/bsentity/dbmeta/RequestHeaderDbm.java index 3e89d49cc..e392bc0b4 100644 --- a/src/main/java/org/codelibs/fess/es/config/bsentity/dbmeta/RequestHeaderDbm.java +++ b/src/main/java/org/codelibs/fess/es/config/bsentity/dbmeta/RequestHeaderDbm.java @@ -15,11 +15,12 @@ */ package org.codelibs.fess.es.config.bsentity.dbmeta; -import java.time.LocalDateTime; +import java.time.*; import java.util.List; import java.util.Map; import org.codelibs.fess.es.config.exentity.RequestHeader; + import org.dbflute.Entity; import org.dbflute.dbmeta.AbstractDBMeta; import org.dbflute.dbmeta.info.ColumnInfo; @@ -79,19 +80,13 @@ public class RequestHeaderDbm extends AbstractDBMeta { // --------------- protected final Map _epgMap = newHashMap(); { - setupEpg(_epgMap, et -> ((RequestHeader) et).getCreatedBy(), - (et, vl) -> ((RequestHeader) et).setCreatedBy(DfTypeUtil.toString(vl)), "createdBy"); - setupEpg(_epgMap, et -> ((RequestHeader) et).getCreatedTime(), - (et, vl) -> ((RequestHeader) et).setCreatedTime(DfTypeUtil.toLong(vl)), "createdTime"); - setupEpg(_epgMap, et -> ((RequestHeader) et).getName(), (et, vl) -> ((RequestHeader) et).setName(DfTypeUtil.toString(vl)), "name"); - setupEpg(_epgMap, et -> ((RequestHeader) et).getUpdatedBy(), - (et, vl) -> ((RequestHeader) et).setUpdatedBy(DfTypeUtil.toString(vl)), "updatedBy"); - setupEpg(_epgMap, et -> ((RequestHeader) et).getUpdatedTime(), - (et, vl) -> ((RequestHeader) et).setUpdatedTime(DfTypeUtil.toLong(vl)), "updatedTime"); - setupEpg(_epgMap, et -> ((RequestHeader) et).getValue(), (et, vl) -> ((RequestHeader) et).setValue(DfTypeUtil.toString(vl)), - "value"); - setupEpg(_epgMap, et -> ((RequestHeader) et).getWebConfigId(), - (et, vl) -> ((RequestHeader) et).setWebConfigId(DfTypeUtil.toString(vl)), "webConfigId"); + setupEpg(_epgMap, et-> ((RequestHeader)et).getCreatedBy(),(et,vl)->((RequestHeader) et).setCreatedBy(DfTypeUtil.toString(vl)), "createdBy"); + setupEpg(_epgMap, et-> ((RequestHeader)et).getCreatedTime(),(et,vl)->((RequestHeader) et).setCreatedTime(DfTypeUtil.toLong(vl)), "createdTime"); + setupEpg(_epgMap, et-> ((RequestHeader)et).getName(),(et,vl)->((RequestHeader) et).setName(DfTypeUtil.toString(vl)), "name"); + setupEpg(_epgMap, et-> ((RequestHeader)et).getUpdatedBy(),(et,vl)->((RequestHeader) et).setUpdatedBy(DfTypeUtil.toString(vl)), "updatedBy"); + setupEpg(_epgMap, et-> ((RequestHeader)et).getUpdatedTime(),(et,vl)->((RequestHeader) et).setUpdatedTime(DfTypeUtil.toLong(vl)), "updatedTime"); + setupEpg(_epgMap, et-> ((RequestHeader)et).getValue(),(et,vl)->((RequestHeader) et).setValue(DfTypeUtil.toString(vl)), "value"); + setupEpg(_epgMap, et-> ((RequestHeader)et).getWebConfigId(),(et,vl)->((RequestHeader) et).setWebConfigId(DfTypeUtil.toString(vl)), "webConfigId"); } @Override @@ -105,71 +100,32 @@ public class RequestHeaderDbm extends AbstractDBMeta { protected final String _tableDbName = "request_header"; protected final String _tableDispName = "request_header"; protected final String _tablePropertyName = "RequestHeader"; - - public String getTableDbName() { - return _tableDbName; - } - + public String getTableDbName() { return _tableDbName; } @Override - public String getTableDispName() { - return _tableDispName; - } - + public String getTableDispName() { return _tableDispName; } @Override - public String getTablePropertyName() { - return _tablePropertyName; - } - + public String getTablePropertyName() { return _tablePropertyName; } @Override - public TableSqlName getTableSqlName() { - return null; - } + public TableSqlName getTableSqlName() { return null; } // =================================================================================== // Column Info // =========== - protected final ColumnInfo _columnCreatedBy = cci("createdBy", "createdBy", null, null, String.class, "createdBy", null, false, false, - false, "String", 0, 0, null, false, null, null, null, null, null, false); - protected final ColumnInfo _columnCreatedTime = cci("createdTime", "createdTime", null, null, Long.class, "createdTime", null, false, - false, false, "Long", 0, 0, null, false, null, null, null, null, null, false); - protected final ColumnInfo _columnName = cci("name", "name", null, null, String.class, "name", null, false, false, false, "String", 0, - 0, null, false, null, null, null, null, null, false); - protected final ColumnInfo _columnUpdatedBy = cci("updatedBy", "updatedBy", null, null, String.class, "updatedBy", null, false, false, - false, "String", 0, 0, null, false, null, null, null, null, null, false); - protected final ColumnInfo _columnUpdatedTime = cci("updatedTime", "updatedTime", null, null, Long.class, "updatedTime", null, false, - false, false, "Long", 0, 0, null, false, null, null, null, null, null, false); - protected final ColumnInfo _columnValue = cci("value", "value", null, null, String.class, "value", null, false, false, false, "String", - 0, 0, null, false, null, null, null, null, null, false); - protected final ColumnInfo _columnWebConfigId = cci("webConfigId", "webConfigId", null, null, String.class, "webConfigId", null, false, - false, false, "String", 0, 0, null, false, null, null, null, null, null, false); + protected final ColumnInfo _columnCreatedBy = cci("createdBy", "createdBy", null, null, String.class, "createdBy", null, false, false, false, "String", 0, 0, null, false, null, null, null, null, null, false); + protected final ColumnInfo _columnCreatedTime = cci("createdTime", "createdTime", null, null, Long.class, "createdTime", null, false, false, false, "Long", 0, 0, null, false, null, null, null, null, null, false); + protected final ColumnInfo _columnName = cci("name", "name", null, null, String.class, "name", null, false, false, false, "String", 0, 0, null, false, null, null, null, null, null, false); + protected final ColumnInfo _columnUpdatedBy = cci("updatedBy", "updatedBy", null, null, String.class, "updatedBy", null, false, false, false, "String", 0, 0, null, false, null, null, null, null, null, false); + protected final ColumnInfo _columnUpdatedTime = cci("updatedTime", "updatedTime", null, null, Long.class, "updatedTime", null, false, false, false, "Long", 0, 0, null, false, null, null, null, null, null, false); + protected final ColumnInfo _columnValue = cci("value", "value", null, null, String.class, "value", null, false, false, false, "String", 0, 0, null, false, null, null, null, null, null, false); + protected final ColumnInfo _columnWebConfigId = cci("webConfigId", "webConfigId", null, null, String.class, "webConfigId", null, false, false, false, "String", 0, 0, null, false, null, null, null, null, null, false); - public ColumnInfo columnCreatedBy() { - return _columnCreatedBy; - } - - public ColumnInfo columnCreatedTime() { - return _columnCreatedTime; - } - - public ColumnInfo columnName() { - return _columnName; - } - - public ColumnInfo columnUpdatedBy() { - return _columnUpdatedBy; - } - - public ColumnInfo columnUpdatedTime() { - return _columnUpdatedTime; - } - - public ColumnInfo columnValue() { - return _columnValue; - } - - public ColumnInfo columnWebConfigId() { - return _columnWebConfigId; - } + public ColumnInfo columnCreatedBy() { return _columnCreatedBy; } + public ColumnInfo columnCreatedTime() { return _columnCreatedTime; } + public ColumnInfo columnName() { return _columnName; } + public ColumnInfo columnUpdatedBy() { return _columnUpdatedBy; } + public ColumnInfo columnUpdatedTime() { return _columnUpdatedTime; } + public ColumnInfo columnValue() { return _columnValue; } + public ColumnInfo columnWebConfigId() { return _columnWebConfigId; } protected List ccil() { List ls = newArrayList(); @@ -256,3 +212,4 @@ public class RequestHeaderDbm extends AbstractDBMeta { return null; } } + diff --git a/src/main/java/org/codelibs/fess/es/config/bsentity/dbmeta/RoleTypeDbm.java b/src/main/java/org/codelibs/fess/es/config/bsentity/dbmeta/RoleTypeDbm.java index dadc4456d..32c359c83 100644 --- a/src/main/java/org/codelibs/fess/es/config/bsentity/dbmeta/RoleTypeDbm.java +++ b/src/main/java/org/codelibs/fess/es/config/bsentity/dbmeta/RoleTypeDbm.java @@ -15,11 +15,12 @@ */ package org.codelibs.fess.es.config.bsentity.dbmeta; -import java.time.LocalDateTime; +import java.time.*; import java.util.List; import java.util.Map; import org.codelibs.fess.es.config.exentity.RoleType; + import org.dbflute.Entity; import org.dbflute.dbmeta.AbstractDBMeta; import org.dbflute.dbmeta.info.ColumnInfo; @@ -79,18 +80,13 @@ public class RoleTypeDbm extends AbstractDBMeta { // --------------- protected final Map _epgMap = newHashMap(); { - setupEpg(_epgMap, et -> ((RoleType) et).getCreatedBy(), (et, vl) -> ((RoleType) et).setCreatedBy(DfTypeUtil.toString(vl)), - "createdBy"); - setupEpg(_epgMap, et -> ((RoleType) et).getCreatedTime(), (et, vl) -> ((RoleType) et).setCreatedTime(DfTypeUtil.toLong(vl)), - "createdTime"); - setupEpg(_epgMap, et -> ((RoleType) et).getName(), (et, vl) -> ((RoleType) et).setName(DfTypeUtil.toString(vl)), "name"); - setupEpg(_epgMap, et -> ((RoleType) et).getSortOrder(), (et, vl) -> ((RoleType) et).setSortOrder(DfTypeUtil.toInteger(vl)), - "sortOrder"); - setupEpg(_epgMap, et -> ((RoleType) et).getUpdatedBy(), (et, vl) -> ((RoleType) et).setUpdatedBy(DfTypeUtil.toString(vl)), - "updatedBy"); - setupEpg(_epgMap, et -> ((RoleType) et).getUpdatedTime(), (et, vl) -> ((RoleType) et).setUpdatedTime(DfTypeUtil.toLong(vl)), - "updatedTime"); - setupEpg(_epgMap, et -> ((RoleType) et).getValue(), (et, vl) -> ((RoleType) et).setValue(DfTypeUtil.toString(vl)), "value"); + setupEpg(_epgMap, et-> ((RoleType)et).getCreatedBy(),(et,vl)->((RoleType) et).setCreatedBy(DfTypeUtil.toString(vl)), "createdBy"); + setupEpg(_epgMap, et-> ((RoleType)et).getCreatedTime(),(et,vl)->((RoleType) et).setCreatedTime(DfTypeUtil.toLong(vl)), "createdTime"); + setupEpg(_epgMap, et-> ((RoleType)et).getName(),(et,vl)->((RoleType) et).setName(DfTypeUtil.toString(vl)), "name"); + setupEpg(_epgMap, et-> ((RoleType)et).getSortOrder(),(et,vl)->((RoleType) et).setSortOrder(DfTypeUtil.toInteger(vl)), "sortOrder"); + setupEpg(_epgMap, et-> ((RoleType)et).getUpdatedBy(),(et,vl)->((RoleType) et).setUpdatedBy(DfTypeUtil.toString(vl)), "updatedBy"); + setupEpg(_epgMap, et-> ((RoleType)et).getUpdatedTime(),(et,vl)->((RoleType) et).setUpdatedTime(DfTypeUtil.toLong(vl)), "updatedTime"); + setupEpg(_epgMap, et-> ((RoleType)et).getValue(),(et,vl)->((RoleType) et).setValue(DfTypeUtil.toString(vl)), "value"); } @Override @@ -104,71 +100,32 @@ public class RoleTypeDbm extends AbstractDBMeta { protected final String _tableDbName = "role_type"; protected final String _tableDispName = "role_type"; protected final String _tablePropertyName = "RoleType"; - - public String getTableDbName() { - return _tableDbName; - } - + public String getTableDbName() { return _tableDbName; } @Override - public String getTableDispName() { - return _tableDispName; - } - + public String getTableDispName() { return _tableDispName; } @Override - public String getTablePropertyName() { - return _tablePropertyName; - } - + public String getTablePropertyName() { return _tablePropertyName; } @Override - public TableSqlName getTableSqlName() { - return null; - } + public TableSqlName getTableSqlName() { return null; } // =================================================================================== // Column Info // =========== - protected final ColumnInfo _columnCreatedBy = cci("createdBy", "createdBy", null, null, String.class, "createdBy", null, false, false, - false, "String", 0, 0, null, false, null, null, null, null, null, false); - protected final ColumnInfo _columnCreatedTime = cci("createdTime", "createdTime", null, null, Long.class, "createdTime", null, false, - false, false, "Long", 0, 0, null, false, null, null, null, null, null, false); - protected final ColumnInfo _columnName = cci("name", "name", null, null, String.class, "name", null, false, false, false, "String", 0, - 0, null, false, null, null, null, null, null, false); - protected final ColumnInfo _columnSortOrder = cci("sortOrder", "sortOrder", null, null, Integer.class, "sortOrder", null, false, false, - false, "Integer", 0, 0, null, false, null, null, null, null, null, false); - protected final ColumnInfo _columnUpdatedBy = cci("updatedBy", "updatedBy", null, null, String.class, "updatedBy", null, false, false, - false, "String", 0, 0, null, false, null, null, null, null, null, false); - protected final ColumnInfo _columnUpdatedTime = cci("updatedTime", "updatedTime", null, null, Long.class, "updatedTime", null, false, - false, false, "Long", 0, 0, null, false, null, null, null, null, null, false); - protected final ColumnInfo _columnValue = cci("value", "value", null, null, String.class, "value", null, false, false, false, "String", - 0, 0, null, false, null, null, null, null, null, false); + protected final ColumnInfo _columnCreatedBy = cci("createdBy", "createdBy", null, null, String.class, "createdBy", null, false, false, false, "String", 0, 0, null, false, null, null, null, null, null, false); + protected final ColumnInfo _columnCreatedTime = cci("createdTime", "createdTime", null, null, Long.class, "createdTime", null, false, false, false, "Long", 0, 0, null, false, null, null, null, null, null, false); + protected final ColumnInfo _columnName = cci("name", "name", null, null, String.class, "name", null, false, false, false, "String", 0, 0, null, false, null, null, null, null, null, false); + protected final ColumnInfo _columnSortOrder = cci("sortOrder", "sortOrder", null, null, Integer.class, "sortOrder", null, false, false, false, "Integer", 0, 0, null, false, null, null, null, null, null, false); + protected final ColumnInfo _columnUpdatedBy = cci("updatedBy", "updatedBy", null, null, String.class, "updatedBy", null, false, false, false, "String", 0, 0, null, false, null, null, null, null, null, false); + protected final ColumnInfo _columnUpdatedTime = cci("updatedTime", "updatedTime", null, null, Long.class, "updatedTime", null, false, false, false, "Long", 0, 0, null, false, null, null, null, null, null, false); + protected final ColumnInfo _columnValue = cci("value", "value", null, null, String.class, "value", null, false, false, false, "String", 0, 0, null, false, null, null, null, null, null, false); - public ColumnInfo columnCreatedBy() { - return _columnCreatedBy; - } - - public ColumnInfo columnCreatedTime() { - return _columnCreatedTime; - } - - public ColumnInfo columnName() { - return _columnName; - } - - public ColumnInfo columnSortOrder() { - return _columnSortOrder; - } - - public ColumnInfo columnUpdatedBy() { - return _columnUpdatedBy; - } - - public ColumnInfo columnUpdatedTime() { - return _columnUpdatedTime; - } - - public ColumnInfo columnValue() { - return _columnValue; - } + public ColumnInfo columnCreatedBy() { return _columnCreatedBy; } + public ColumnInfo columnCreatedTime() { return _columnCreatedTime; } + public ColumnInfo columnName() { return _columnName; } + public ColumnInfo columnSortOrder() { return _columnSortOrder; } + public ColumnInfo columnUpdatedBy() { return _columnUpdatedBy; } + public ColumnInfo columnUpdatedTime() { return _columnUpdatedTime; } + public ColumnInfo columnValue() { return _columnValue; } protected List ccil() { List ls = newArrayList(); @@ -255,3 +212,4 @@ public class RoleTypeDbm extends AbstractDBMeta { return null; } } + diff --git a/src/main/java/org/codelibs/fess/es/config/bsentity/dbmeta/ScheduledJobDbm.java b/src/main/java/org/codelibs/fess/es/config/bsentity/dbmeta/ScheduledJobDbm.java index f1184888a..094e92939 100644 --- a/src/main/java/org/codelibs/fess/es/config/bsentity/dbmeta/ScheduledJobDbm.java +++ b/src/main/java/org/codelibs/fess/es/config/bsentity/dbmeta/ScheduledJobDbm.java @@ -15,11 +15,12 @@ */ package org.codelibs.fess.es.config.bsentity.dbmeta; -import java.time.LocalDateTime; +import java.time.*; import java.util.List; import java.util.Map; import org.codelibs.fess.es.config.exentity.ScheduledJob; + import org.dbflute.Entity; import org.dbflute.dbmeta.AbstractDBMeta; import org.dbflute.dbmeta.info.ColumnInfo; @@ -79,31 +80,19 @@ public class ScheduledJobDbm extends AbstractDBMeta { // --------------- protected final Map _epgMap = newHashMap(); { - setupEpg(_epgMap, et -> ((ScheduledJob) et).getAvailable(), (et, vl) -> ((ScheduledJob) et).setAvailable(DfTypeUtil.toBoolean(vl)), - "available"); - setupEpg(_epgMap, et -> ((ScheduledJob) et).getCrawler(), (et, vl) -> ((ScheduledJob) et).setCrawler(DfTypeUtil.toBoolean(vl)), - "crawler"); - setupEpg(_epgMap, et -> ((ScheduledJob) et).getCreatedBy(), (et, vl) -> ((ScheduledJob) et).setCreatedBy(DfTypeUtil.toString(vl)), - "createdBy"); - setupEpg(_epgMap, et -> ((ScheduledJob) et).getCreatedTime(), - (et, vl) -> ((ScheduledJob) et).setCreatedTime(DfTypeUtil.toLong(vl)), "createdTime"); - setupEpg(_epgMap, et -> ((ScheduledJob) et).getCronExpression(), - (et, vl) -> ((ScheduledJob) et).setCronExpression(DfTypeUtil.toString(vl)), "cronExpression"); - setupEpg(_epgMap, et -> ((ScheduledJob) et).getJobLogging(), - (et, vl) -> ((ScheduledJob) et).setJobLogging(DfTypeUtil.toBoolean(vl)), "jobLogging"); - setupEpg(_epgMap, et -> ((ScheduledJob) et).getName(), (et, vl) -> ((ScheduledJob) et).setName(DfTypeUtil.toString(vl)), "name"); - setupEpg(_epgMap, et -> ((ScheduledJob) et).getScriptData(), - (et, vl) -> ((ScheduledJob) et).setScriptData(DfTypeUtil.toString(vl)), "scriptData"); - setupEpg(_epgMap, et -> ((ScheduledJob) et).getScriptType(), - (et, vl) -> ((ScheduledJob) et).setScriptType(DfTypeUtil.toString(vl)), "scriptType"); - setupEpg(_epgMap, et -> ((ScheduledJob) et).getSortOrder(), (et, vl) -> ((ScheduledJob) et).setSortOrder(DfTypeUtil.toInteger(vl)), - "sortOrder"); - setupEpg(_epgMap, et -> ((ScheduledJob) et).getTarget(), (et, vl) -> ((ScheduledJob) et).setTarget(DfTypeUtil.toString(vl)), - "target"); - setupEpg(_epgMap, et -> ((ScheduledJob) et).getUpdatedBy(), (et, vl) -> ((ScheduledJob) et).setUpdatedBy(DfTypeUtil.toString(vl)), - "updatedBy"); - setupEpg(_epgMap, et -> ((ScheduledJob) et).getUpdatedTime(), - (et, vl) -> ((ScheduledJob) et).setUpdatedTime(DfTypeUtil.toLong(vl)), "updatedTime"); + setupEpg(_epgMap, et-> ((ScheduledJob)et).getAvailable(),(et,vl)->((ScheduledJob) et).setAvailable(DfTypeUtil.toBoolean(vl)), "available"); + setupEpg(_epgMap, et-> ((ScheduledJob)et).getCrawler(),(et,vl)->((ScheduledJob) et).setCrawler(DfTypeUtil.toBoolean(vl)), "crawler"); + setupEpg(_epgMap, et-> ((ScheduledJob)et).getCreatedBy(),(et,vl)->((ScheduledJob) et).setCreatedBy(DfTypeUtil.toString(vl)), "createdBy"); + setupEpg(_epgMap, et-> ((ScheduledJob)et).getCreatedTime(),(et,vl)->((ScheduledJob) et).setCreatedTime(DfTypeUtil.toLong(vl)), "createdTime"); + setupEpg(_epgMap, et-> ((ScheduledJob)et).getCronExpression(),(et,vl)->((ScheduledJob) et).setCronExpression(DfTypeUtil.toString(vl)), "cronExpression"); + setupEpg(_epgMap, et-> ((ScheduledJob)et).getJobLogging(),(et,vl)->((ScheduledJob) et).setJobLogging(DfTypeUtil.toBoolean(vl)), "jobLogging"); + setupEpg(_epgMap, et-> ((ScheduledJob)et).getName(),(et,vl)->((ScheduledJob) et).setName(DfTypeUtil.toString(vl)), "name"); + setupEpg(_epgMap, et-> ((ScheduledJob)et).getScriptData(),(et,vl)->((ScheduledJob) et).setScriptData(DfTypeUtil.toString(vl)), "scriptData"); + setupEpg(_epgMap, et-> ((ScheduledJob)et).getScriptType(),(et,vl)->((ScheduledJob) et).setScriptType(DfTypeUtil.toString(vl)), "scriptType"); + setupEpg(_epgMap, et-> ((ScheduledJob)et).getSortOrder(),(et,vl)->((ScheduledJob) et).setSortOrder(DfTypeUtil.toInteger(vl)), "sortOrder"); + setupEpg(_epgMap, et-> ((ScheduledJob)et).getTarget(),(et,vl)->((ScheduledJob) et).setTarget(DfTypeUtil.toString(vl)), "target"); + setupEpg(_epgMap, et-> ((ScheduledJob)et).getUpdatedBy(),(et,vl)->((ScheduledJob) et).setUpdatedBy(DfTypeUtil.toString(vl)), "updatedBy"); + setupEpg(_epgMap, et-> ((ScheduledJob)et).getUpdatedTime(),(et,vl)->((ScheduledJob) et).setUpdatedTime(DfTypeUtil.toLong(vl)), "updatedTime"); } @Override @@ -117,107 +106,44 @@ public class ScheduledJobDbm extends AbstractDBMeta { protected final String _tableDbName = "scheduled_job"; protected final String _tableDispName = "scheduled_job"; protected final String _tablePropertyName = "ScheduledJob"; - - public String getTableDbName() { - return _tableDbName; - } - + public String getTableDbName() { return _tableDbName; } @Override - public String getTableDispName() { - return _tableDispName; - } - + public String getTableDispName() { return _tableDispName; } @Override - public String getTablePropertyName() { - return _tablePropertyName; - } - + public String getTablePropertyName() { return _tablePropertyName; } @Override - public TableSqlName getTableSqlName() { - return null; - } + public TableSqlName getTableSqlName() { return null; } // =================================================================================== // Column Info // =========== - protected final ColumnInfo _columnAvailable = cci("available", "available", null, null, Boolean.class, "available", null, false, false, - false, "Boolean", 0, 0, null, false, null, null, null, null, null, false); - protected final ColumnInfo _columnCrawler = cci("crawler", "crawler", null, null, Boolean.class, "crawler", null, false, false, false, - "Boolean", 0, 0, null, false, null, null, null, null, null, false); - protected final ColumnInfo _columnCreatedBy = cci("createdBy", "createdBy", null, null, String.class, "createdBy", null, false, false, - false, "String", 0, 0, null, false, null, null, null, null, null, false); - protected final ColumnInfo _columnCreatedTime = cci("createdTime", "createdTime", null, null, Long.class, "createdTime", null, false, - false, false, "Long", 0, 0, null, false, null, null, null, null, null, false); - protected final ColumnInfo _columnCronExpression = cci("cronExpression", "cronExpression", null, null, String.class, "cronExpression", - null, false, false, false, "String", 0, 0, null, false, null, null, null, null, null, false); - protected final ColumnInfo _columnJobLogging = cci("jobLogging", "jobLogging", null, null, Boolean.class, "jobLogging", null, false, - false, false, "Boolean", 0, 0, null, false, null, null, null, null, null, false); - protected final ColumnInfo _columnName = cci("name", "name", null, null, String.class, "name", null, false, false, false, "String", 0, - 0, null, false, null, null, null, null, null, false); - protected final ColumnInfo _columnScriptData = cci("scriptData", "scriptData", null, null, String.class, "scriptData", null, false, - false, false, "String", 0, 0, null, false, null, null, null, null, null, false); - protected final ColumnInfo _columnScriptType = cci("scriptType", "scriptType", null, null, String.class, "scriptType", null, false, - false, false, "String", 0, 0, null, false, null, null, null, null, null, false); - protected final ColumnInfo _columnSortOrder = cci("sortOrder", "sortOrder", null, null, Integer.class, "sortOrder", null, false, false, - false, "Integer", 0, 0, null, false, null, null, null, null, null, false); - protected final ColumnInfo _columnTarget = cci("target", "target", null, null, String.class, "target", null, false, false, false, - "String", 0, 0, null, false, null, null, null, null, null, false); - protected final ColumnInfo _columnUpdatedBy = cci("updatedBy", "updatedBy", null, null, String.class, "updatedBy", null, false, false, - false, "String", 0, 0, null, false, null, null, null, null, null, false); - protected final ColumnInfo _columnUpdatedTime = cci("updatedTime", "updatedTime", null, null, Long.class, "updatedTime", null, false, - false, false, "Long", 0, 0, null, false, null, null, null, null, null, false); + protected final ColumnInfo _columnAvailable = cci("available", "available", null, null, Boolean.class, "available", null, false, false, false, "Boolean", 0, 0, null, false, null, null, null, null, null, false); + protected final ColumnInfo _columnCrawler = cci("crawler", "crawler", null, null, Boolean.class, "crawler", null, false, false, false, "Boolean", 0, 0, null, false, null, null, null, null, null, false); + protected final ColumnInfo _columnCreatedBy = cci("createdBy", "createdBy", null, null, String.class, "createdBy", null, false, false, false, "String", 0, 0, null, false, null, null, null, null, null, false); + protected final ColumnInfo _columnCreatedTime = cci("createdTime", "createdTime", null, null, Long.class, "createdTime", null, false, false, false, "Long", 0, 0, null, false, null, null, null, null, null, false); + protected final ColumnInfo _columnCronExpression = cci("cronExpression", "cronExpression", null, null, String.class, "cronExpression", null, false, false, false, "String", 0, 0, null, false, null, null, null, null, null, false); + protected final ColumnInfo _columnJobLogging = cci("jobLogging", "jobLogging", null, null, Boolean.class, "jobLogging", null, false, false, false, "Boolean", 0, 0, null, false, null, null, null, null, null, false); + protected final ColumnInfo _columnName = cci("name", "name", null, null, String.class, "name", null, false, false, false, "String", 0, 0, null, false, null, null, null, null, null, false); + protected final ColumnInfo _columnScriptData = cci("scriptData", "scriptData", null, null, String.class, "scriptData", null, false, false, false, "String", 0, 0, null, false, null, null, null, null, null, false); + protected final ColumnInfo _columnScriptType = cci("scriptType", "scriptType", null, null, String.class, "scriptType", null, false, false, false, "String", 0, 0, null, false, null, null, null, null, null, false); + protected final ColumnInfo _columnSortOrder = cci("sortOrder", "sortOrder", null, null, Integer.class, "sortOrder", null, false, false, false, "Integer", 0, 0, null, false, null, null, null, null, null, false); + protected final ColumnInfo _columnTarget = cci("target", "target", null, null, String.class, "target", null, false, false, false, "String", 0, 0, null, false, null, null, null, null, null, false); + protected final ColumnInfo _columnUpdatedBy = cci("updatedBy", "updatedBy", null, null, String.class, "updatedBy", null, false, false, false, "String", 0, 0, null, false, null, null, null, null, null, false); + protected final ColumnInfo _columnUpdatedTime = cci("updatedTime", "updatedTime", null, null, Long.class, "updatedTime", null, false, false, false, "Long", 0, 0, null, false, null, null, null, null, null, false); - public ColumnInfo columnAvailable() { - return _columnAvailable; - } - - public ColumnInfo columnCrawler() { - return _columnCrawler; - } - - public ColumnInfo columnCreatedBy() { - return _columnCreatedBy; - } - - public ColumnInfo columnCreatedTime() { - return _columnCreatedTime; - } - - public ColumnInfo columnCronExpression() { - return _columnCronExpression; - } - - public ColumnInfo columnJobLogging() { - return _columnJobLogging; - } - - public ColumnInfo columnName() { - return _columnName; - } - - public ColumnInfo columnScriptData() { - return _columnScriptData; - } - - public ColumnInfo columnScriptType() { - return _columnScriptType; - } - - public ColumnInfo columnSortOrder() { - return _columnSortOrder; - } - - public ColumnInfo columnTarget() { - return _columnTarget; - } - - public ColumnInfo columnUpdatedBy() { - return _columnUpdatedBy; - } - - public ColumnInfo columnUpdatedTime() { - return _columnUpdatedTime; - } + public ColumnInfo columnAvailable() { return _columnAvailable; } + public ColumnInfo columnCrawler() { return _columnCrawler; } + public ColumnInfo columnCreatedBy() { return _columnCreatedBy; } + public ColumnInfo columnCreatedTime() { return _columnCreatedTime; } + public ColumnInfo columnCronExpression() { return _columnCronExpression; } + public ColumnInfo columnJobLogging() { return _columnJobLogging; } + public ColumnInfo columnName() { return _columnName; } + public ColumnInfo columnScriptData() { return _columnScriptData; } + public ColumnInfo columnScriptType() { return _columnScriptType; } + public ColumnInfo columnSortOrder() { return _columnSortOrder; } + public ColumnInfo columnTarget() { return _columnTarget; } + public ColumnInfo columnUpdatedBy() { return _columnUpdatedBy; } + public ColumnInfo columnUpdatedTime() { return _columnUpdatedTime; } protected List ccil() { List ls = newArrayList(); @@ -310,3 +236,4 @@ public class ScheduledJobDbm extends AbstractDBMeta { return null; } } + diff --git a/src/main/java/org/codelibs/fess/es/config/bsentity/dbmeta/SuggestBadWordDbm.java b/src/main/java/org/codelibs/fess/es/config/bsentity/dbmeta/SuggestBadWordDbm.java index e76de36ac..8d5b1f1cc 100644 --- a/src/main/java/org/codelibs/fess/es/config/bsentity/dbmeta/SuggestBadWordDbm.java +++ b/src/main/java/org/codelibs/fess/es/config/bsentity/dbmeta/SuggestBadWordDbm.java @@ -15,11 +15,12 @@ */ package org.codelibs.fess.es.config.bsentity.dbmeta; -import java.time.LocalDateTime; +import java.time.*; import java.util.List; import java.util.Map; import org.codelibs.fess.es.config.exentity.SuggestBadWord; + import org.dbflute.Entity; import org.dbflute.dbmeta.AbstractDBMeta; import org.dbflute.dbmeta.info.ColumnInfo; @@ -79,20 +80,13 @@ public class SuggestBadWordDbm extends AbstractDBMeta { // --------------- protected final Map _epgMap = newHashMap(); { - setupEpg(_epgMap, et -> ((SuggestBadWord) et).getCreatedBy(), - (et, vl) -> ((SuggestBadWord) et).setCreatedBy(DfTypeUtil.toString(vl)), "createdBy"); - setupEpg(_epgMap, et -> ((SuggestBadWord) et).getCreatedTime(), - (et, vl) -> ((SuggestBadWord) et).setCreatedTime(DfTypeUtil.toLong(vl)), "createdTime"); - setupEpg(_epgMap, et -> ((SuggestBadWord) et).getSuggestWord(), - (et, vl) -> ((SuggestBadWord) et).setSuggestWord(DfTypeUtil.toString(vl)), "suggestWord"); - setupEpg(_epgMap, et -> ((SuggestBadWord) et).getTargetLabel(), - (et, vl) -> ((SuggestBadWord) et).setTargetLabel(DfTypeUtil.toString(vl)), "targetLabel"); - setupEpg(_epgMap, et -> ((SuggestBadWord) et).getTargetRole(), - (et, vl) -> ((SuggestBadWord) et).setTargetRole(DfTypeUtil.toString(vl)), "targetRole"); - setupEpg(_epgMap, et -> ((SuggestBadWord) et).getUpdatedBy(), - (et, vl) -> ((SuggestBadWord) et).setUpdatedBy(DfTypeUtil.toString(vl)), "updatedBy"); - setupEpg(_epgMap, et -> ((SuggestBadWord) et).getUpdatedTime(), - (et, vl) -> ((SuggestBadWord) et).setUpdatedTime(DfTypeUtil.toLong(vl)), "updatedTime"); + setupEpg(_epgMap, et-> ((SuggestBadWord)et).getCreatedBy(),(et,vl)->((SuggestBadWord) et).setCreatedBy(DfTypeUtil.toString(vl)), "createdBy"); + setupEpg(_epgMap, et-> ((SuggestBadWord)et).getCreatedTime(),(et,vl)->((SuggestBadWord) et).setCreatedTime(DfTypeUtil.toLong(vl)), "createdTime"); + setupEpg(_epgMap, et-> ((SuggestBadWord)et).getSuggestWord(),(et,vl)->((SuggestBadWord) et).setSuggestWord(DfTypeUtil.toString(vl)), "suggestWord"); + setupEpg(_epgMap, et-> ((SuggestBadWord)et).getTargetLabel(),(et,vl)->((SuggestBadWord) et).setTargetLabel(DfTypeUtil.toString(vl)), "targetLabel"); + setupEpg(_epgMap, et-> ((SuggestBadWord)et).getTargetRole(),(et,vl)->((SuggestBadWord) et).setTargetRole(DfTypeUtil.toString(vl)), "targetRole"); + setupEpg(_epgMap, et-> ((SuggestBadWord)et).getUpdatedBy(),(et,vl)->((SuggestBadWord) et).setUpdatedBy(DfTypeUtil.toString(vl)), "updatedBy"); + setupEpg(_epgMap, et-> ((SuggestBadWord)et).getUpdatedTime(),(et,vl)->((SuggestBadWord) et).setUpdatedTime(DfTypeUtil.toLong(vl)), "updatedTime"); } @Override @@ -106,71 +100,32 @@ public class SuggestBadWordDbm extends AbstractDBMeta { protected final String _tableDbName = "suggest_bad_word"; protected final String _tableDispName = "suggest_bad_word"; protected final String _tablePropertyName = "SuggestBadWord"; - - public String getTableDbName() { - return _tableDbName; - } - + public String getTableDbName() { return _tableDbName; } @Override - public String getTableDispName() { - return _tableDispName; - } - + public String getTableDispName() { return _tableDispName; } @Override - public String getTablePropertyName() { - return _tablePropertyName; - } - + public String getTablePropertyName() { return _tablePropertyName; } @Override - public TableSqlName getTableSqlName() { - return null; - } + public TableSqlName getTableSqlName() { return null; } // =================================================================================== // Column Info // =========== - protected final ColumnInfo _columnCreatedBy = cci("createdBy", "createdBy", null, null, String.class, "createdBy", null, false, false, - false, "String", 0, 0, null, false, null, null, null, null, null, false); - protected final ColumnInfo _columnCreatedTime = cci("createdTime", "createdTime", null, null, Long.class, "createdTime", null, false, - false, false, "Long", 0, 0, null, false, null, null, null, null, null, false); - protected final ColumnInfo _columnSuggestWord = cci("suggestWord", "suggestWord", null, null, String.class, "suggestWord", null, false, - false, false, "String", 0, 0, null, false, null, null, null, null, null, false); - protected final ColumnInfo _columnTargetLabel = cci("targetLabel", "targetLabel", null, null, String.class, "targetLabel", null, false, - false, false, "String", 0, 0, null, false, null, null, null, null, null, false); - protected final ColumnInfo _columnTargetRole = cci("targetRole", "targetRole", null, null, String.class, "targetRole", null, false, - false, false, "String", 0, 0, null, false, null, null, null, null, null, false); - protected final ColumnInfo _columnUpdatedBy = cci("updatedBy", "updatedBy", null, null, String.class, "updatedBy", null, false, false, - false, "String", 0, 0, null, false, null, null, null, null, null, false); - protected final ColumnInfo _columnUpdatedTime = cci("updatedTime", "updatedTime", null, null, Long.class, "updatedTime", null, false, - false, false, "Long", 0, 0, null, false, null, null, null, null, null, false); + protected final ColumnInfo _columnCreatedBy = cci("createdBy", "createdBy", null, null, String.class, "createdBy", null, false, false, false, "String", 0, 0, null, false, null, null, null, null, null, false); + protected final ColumnInfo _columnCreatedTime = cci("createdTime", "createdTime", null, null, Long.class, "createdTime", null, false, false, false, "Long", 0, 0, null, false, null, null, null, null, null, false); + protected final ColumnInfo _columnSuggestWord = cci("suggestWord", "suggestWord", null, null, String.class, "suggestWord", null, false, false, false, "String", 0, 0, null, false, null, null, null, null, null, false); + protected final ColumnInfo _columnTargetLabel = cci("targetLabel", "targetLabel", null, null, String.class, "targetLabel", null, false, false, false, "String", 0, 0, null, false, null, null, null, null, null, false); + protected final ColumnInfo _columnTargetRole = cci("targetRole", "targetRole", null, null, String.class, "targetRole", null, false, false, false, "String", 0, 0, null, false, null, null, null, null, null, false); + protected final ColumnInfo _columnUpdatedBy = cci("updatedBy", "updatedBy", null, null, String.class, "updatedBy", null, false, false, false, "String", 0, 0, null, false, null, null, null, null, null, false); + protected final ColumnInfo _columnUpdatedTime = cci("updatedTime", "updatedTime", null, null, Long.class, "updatedTime", null, false, false, false, "Long", 0, 0, null, false, null, null, null, null, null, false); - public ColumnInfo columnCreatedBy() { - return _columnCreatedBy; - } - - public ColumnInfo columnCreatedTime() { - return _columnCreatedTime; - } - - public ColumnInfo columnSuggestWord() { - return _columnSuggestWord; - } - - public ColumnInfo columnTargetLabel() { - return _columnTargetLabel; - } - - public ColumnInfo columnTargetRole() { - return _columnTargetRole; - } - - public ColumnInfo columnUpdatedBy() { - return _columnUpdatedBy; - } - - public ColumnInfo columnUpdatedTime() { - return _columnUpdatedTime; - } + public ColumnInfo columnCreatedBy() { return _columnCreatedBy; } + public ColumnInfo columnCreatedTime() { return _columnCreatedTime; } + public ColumnInfo columnSuggestWord() { return _columnSuggestWord; } + public ColumnInfo columnTargetLabel() { return _columnTargetLabel; } + public ColumnInfo columnTargetRole() { return _columnTargetRole; } + public ColumnInfo columnUpdatedBy() { return _columnUpdatedBy; } + public ColumnInfo columnUpdatedTime() { return _columnUpdatedTime; } protected List ccil() { List ls = newArrayList(); @@ -257,3 +212,4 @@ public class SuggestBadWordDbm extends AbstractDBMeta { return null; } } + diff --git a/src/main/java/org/codelibs/fess/es/config/bsentity/dbmeta/SuggestElevateWordDbm.java b/src/main/java/org/codelibs/fess/es/config/bsentity/dbmeta/SuggestElevateWordDbm.java index e6f250e0d..1d8c868dd 100644 --- a/src/main/java/org/codelibs/fess/es/config/bsentity/dbmeta/SuggestElevateWordDbm.java +++ b/src/main/java/org/codelibs/fess/es/config/bsentity/dbmeta/SuggestElevateWordDbm.java @@ -15,11 +15,12 @@ */ package org.codelibs.fess.es.config.bsentity.dbmeta; -import java.time.LocalDateTime; +import java.time.*; import java.util.List; import java.util.Map; import org.codelibs.fess.es.config.exentity.SuggestElevateWord; + import org.dbflute.Entity; import org.dbflute.dbmeta.AbstractDBMeta; import org.dbflute.dbmeta.info.ColumnInfo; @@ -79,24 +80,15 @@ public class SuggestElevateWordDbm extends AbstractDBMeta { // --------------- protected final Map _epgMap = newHashMap(); { - setupEpg(_epgMap, et -> ((SuggestElevateWord) et).getBoost(), - (et, vl) -> ((SuggestElevateWord) et).setBoost(DfTypeUtil.toFloat(vl)), "boost"); - setupEpg(_epgMap, et -> ((SuggestElevateWord) et).getCreatedBy(), - (et, vl) -> ((SuggestElevateWord) et).setCreatedBy(DfTypeUtil.toString(vl)), "createdBy"); - setupEpg(_epgMap, et -> ((SuggestElevateWord) et).getCreatedTime(), - (et, vl) -> ((SuggestElevateWord) et).setCreatedTime(DfTypeUtil.toLong(vl)), "createdTime"); - setupEpg(_epgMap, et -> ((SuggestElevateWord) et).getReading(), - (et, vl) -> ((SuggestElevateWord) et).setReading(DfTypeUtil.toString(vl)), "reading"); - setupEpg(_epgMap, et -> ((SuggestElevateWord) et).getSuggestWord(), - (et, vl) -> ((SuggestElevateWord) et).setSuggestWord(DfTypeUtil.toString(vl)), "suggestWord"); - setupEpg(_epgMap, et -> ((SuggestElevateWord) et).getTargetLabel(), - (et, vl) -> ((SuggestElevateWord) et).setTargetLabel(DfTypeUtil.toString(vl)), "targetLabel"); - setupEpg(_epgMap, et -> ((SuggestElevateWord) et).getTargetRole(), - (et, vl) -> ((SuggestElevateWord) et).setTargetRole(DfTypeUtil.toString(vl)), "targetRole"); - setupEpg(_epgMap, et -> ((SuggestElevateWord) et).getUpdatedBy(), - (et, vl) -> ((SuggestElevateWord) et).setUpdatedBy(DfTypeUtil.toString(vl)), "updatedBy"); - setupEpg(_epgMap, et -> ((SuggestElevateWord) et).getUpdatedTime(), - (et, vl) -> ((SuggestElevateWord) et).setUpdatedTime(DfTypeUtil.toLong(vl)), "updatedTime"); + setupEpg(_epgMap, et-> ((SuggestElevateWord)et).getBoost(),(et,vl)->((SuggestElevateWord) et).setBoost(DfTypeUtil.toFloat(vl)), "boost"); + setupEpg(_epgMap, et-> ((SuggestElevateWord)et).getCreatedBy(),(et,vl)->((SuggestElevateWord) et).setCreatedBy(DfTypeUtil.toString(vl)), "createdBy"); + setupEpg(_epgMap, et-> ((SuggestElevateWord)et).getCreatedTime(),(et,vl)->((SuggestElevateWord) et).setCreatedTime(DfTypeUtil.toLong(vl)), "createdTime"); + setupEpg(_epgMap, et-> ((SuggestElevateWord)et).getReading(),(et,vl)->((SuggestElevateWord) et).setReading(DfTypeUtil.toString(vl)), "reading"); + setupEpg(_epgMap, et-> ((SuggestElevateWord)et).getSuggestWord(),(et,vl)->((SuggestElevateWord) et).setSuggestWord(DfTypeUtil.toString(vl)), "suggestWord"); + setupEpg(_epgMap, et-> ((SuggestElevateWord)et).getTargetLabel(),(et,vl)->((SuggestElevateWord) et).setTargetLabel(DfTypeUtil.toString(vl)), "targetLabel"); + setupEpg(_epgMap, et-> ((SuggestElevateWord)et).getTargetRole(),(et,vl)->((SuggestElevateWord) et).setTargetRole(DfTypeUtil.toString(vl)), "targetRole"); + setupEpg(_epgMap, et-> ((SuggestElevateWord)et).getUpdatedBy(),(et,vl)->((SuggestElevateWord) et).setUpdatedBy(DfTypeUtil.toString(vl)), "updatedBy"); + setupEpg(_epgMap, et-> ((SuggestElevateWord)et).getUpdatedTime(),(et,vl)->((SuggestElevateWord) et).setUpdatedTime(DfTypeUtil.toLong(vl)), "updatedTime"); } @Override @@ -110,83 +102,36 @@ public class SuggestElevateWordDbm extends AbstractDBMeta { protected final String _tableDbName = "suggest_elevate_word"; protected final String _tableDispName = "suggest_elevate_word"; protected final String _tablePropertyName = "SuggestElevateWord"; - - public String getTableDbName() { - return _tableDbName; - } - + public String getTableDbName() { return _tableDbName; } @Override - public String getTableDispName() { - return _tableDispName; - } - + public String getTableDispName() { return _tableDispName; } @Override - public String getTablePropertyName() { - return _tablePropertyName; - } - + public String getTablePropertyName() { return _tablePropertyName; } @Override - public TableSqlName getTableSqlName() { - return null; - } + public TableSqlName getTableSqlName() { return null; } // =================================================================================== // Column Info // =========== - protected final ColumnInfo _columnBoost = cci("boost", "boost", null, null, Float.class, "boost", null, false, false, false, "Float", - 0, 0, null, false, null, null, null, null, null, false); - protected final ColumnInfo _columnCreatedBy = cci("createdBy", "createdBy", null, null, String.class, "createdBy", null, false, false, - false, "String", 0, 0, null, false, null, null, null, null, null, false); - protected final ColumnInfo _columnCreatedTime = cci("createdTime", "createdTime", null, null, Long.class, "createdTime", null, false, - false, false, "Long", 0, 0, null, false, null, null, null, null, null, false); - protected final ColumnInfo _columnReading = cci("reading", "reading", null, null, String.class, "reading", null, false, false, false, - "String", 0, 0, null, false, null, null, null, null, null, false); - protected final ColumnInfo _columnSuggestWord = cci("suggestWord", "suggestWord", null, null, String.class, "suggestWord", null, false, - false, false, "String", 0, 0, null, false, null, null, null, null, null, false); - protected final ColumnInfo _columnTargetLabel = cci("targetLabel", "targetLabel", null, null, String.class, "targetLabel", null, false, - false, false, "String", 0, 0, null, false, null, null, null, null, null, false); - protected final ColumnInfo _columnTargetRole = cci("targetRole", "targetRole", null, null, String.class, "targetRole", null, false, - false, false, "String", 0, 0, null, false, null, null, null, null, null, false); - protected final ColumnInfo _columnUpdatedBy = cci("updatedBy", "updatedBy", null, null, String.class, "updatedBy", null, false, false, - false, "String", 0, 0, null, false, null, null, null, null, null, false); - protected final ColumnInfo _columnUpdatedTime = cci("updatedTime", "updatedTime", null, null, Long.class, "updatedTime", null, false, - false, false, "Long", 0, 0, null, false, null, null, null, null, null, false); + protected final ColumnInfo _columnBoost = cci("boost", "boost", null, null, Float.class, "boost", null, false, false, false, "Float", 0, 0, null, false, null, null, null, null, null, false); + protected final ColumnInfo _columnCreatedBy = cci("createdBy", "createdBy", null, null, String.class, "createdBy", null, false, false, false, "String", 0, 0, null, false, null, null, null, null, null, false); + protected final ColumnInfo _columnCreatedTime = cci("createdTime", "createdTime", null, null, Long.class, "createdTime", null, false, false, false, "Long", 0, 0, null, false, null, null, null, null, null, false); + protected final ColumnInfo _columnReading = cci("reading", "reading", null, null, String.class, "reading", null, false, false, false, "String", 0, 0, null, false, null, null, null, null, null, false); + protected final ColumnInfo _columnSuggestWord = cci("suggestWord", "suggestWord", null, null, String.class, "suggestWord", null, false, false, false, "String", 0, 0, null, false, null, null, null, null, null, false); + protected final ColumnInfo _columnTargetLabel = cci("targetLabel", "targetLabel", null, null, String.class, "targetLabel", null, false, false, false, "String", 0, 0, null, false, null, null, null, null, null, false); + protected final ColumnInfo _columnTargetRole = cci("targetRole", "targetRole", null, null, String.class, "targetRole", null, false, false, false, "String", 0, 0, null, false, null, null, null, null, null, false); + protected final ColumnInfo _columnUpdatedBy = cci("updatedBy", "updatedBy", null, null, String.class, "updatedBy", null, false, false, false, "String", 0, 0, null, false, null, null, null, null, null, false); + protected final ColumnInfo _columnUpdatedTime = cci("updatedTime", "updatedTime", null, null, Long.class, "updatedTime", null, false, false, false, "Long", 0, 0, null, false, null, null, null, null, null, false); - public ColumnInfo columnBoost() { - return _columnBoost; - } - - public ColumnInfo columnCreatedBy() { - return _columnCreatedBy; - } - - public ColumnInfo columnCreatedTime() { - return _columnCreatedTime; - } - - public ColumnInfo columnReading() { - return _columnReading; - } - - public ColumnInfo columnSuggestWord() { - return _columnSuggestWord; - } - - public ColumnInfo columnTargetLabel() { - return _columnTargetLabel; - } - - public ColumnInfo columnTargetRole() { - return _columnTargetRole; - } - - public ColumnInfo columnUpdatedBy() { - return _columnUpdatedBy; - } - - public ColumnInfo columnUpdatedTime() { - return _columnUpdatedTime; - } + public ColumnInfo columnBoost() { return _columnBoost; } + public ColumnInfo columnCreatedBy() { return _columnCreatedBy; } + public ColumnInfo columnCreatedTime() { return _columnCreatedTime; } + public ColumnInfo columnReading() { return _columnReading; } + public ColumnInfo columnSuggestWord() { return _columnSuggestWord; } + public ColumnInfo columnTargetLabel() { return _columnTargetLabel; } + public ColumnInfo columnTargetRole() { return _columnTargetRole; } + public ColumnInfo columnUpdatedBy() { return _columnUpdatedBy; } + public ColumnInfo columnUpdatedTime() { return _columnUpdatedTime; } protected List ccil() { List ls = newArrayList(); @@ -275,3 +220,4 @@ public class SuggestElevateWordDbm extends AbstractDBMeta { return null; } } + diff --git a/src/main/java/org/codelibs/fess/es/config/bsentity/dbmeta/SuggestElevateWordToLabelDbm.java b/src/main/java/org/codelibs/fess/es/config/bsentity/dbmeta/SuggestElevateWordToLabelDbm.java index 42858f31f..780205a95 100644 --- a/src/main/java/org/codelibs/fess/es/config/bsentity/dbmeta/SuggestElevateWordToLabelDbm.java +++ b/src/main/java/org/codelibs/fess/es/config/bsentity/dbmeta/SuggestElevateWordToLabelDbm.java @@ -15,11 +15,12 @@ */ package org.codelibs.fess.es.config.bsentity.dbmeta; -import java.time.LocalDateTime; +import java.time.*; import java.util.List; import java.util.Map; import org.codelibs.fess.es.config.exentity.SuggestElevateWordToLabel; + import org.dbflute.Entity; import org.dbflute.dbmeta.AbstractDBMeta; import org.dbflute.dbmeta.info.ColumnInfo; @@ -79,10 +80,8 @@ public class SuggestElevateWordToLabelDbm extends AbstractDBMeta { // --------------- protected final Map _epgMap = newHashMap(); { - setupEpg(_epgMap, et -> ((SuggestElevateWordToLabel) et).getSuggestElevateWordId(), - (et, vl) -> ((SuggestElevateWordToLabel) et).setSuggestElevateWordId(DfTypeUtil.toString(vl)), "suggestElevateWordId"); - setupEpg(_epgMap, et -> ((SuggestElevateWordToLabel) et).getLabelTypeId(), - (et, vl) -> ((SuggestElevateWordToLabel) et).setLabelTypeId(DfTypeUtil.toString(vl)), "labelTypeId"); + setupEpg(_epgMap, et-> ((SuggestElevateWordToLabel)et).getSuggestElevateWordId(),(et,vl)->((SuggestElevateWordToLabel) et).setSuggestElevateWordId(DfTypeUtil.toString(vl)), "suggestElevateWordId"); + setupEpg(_epgMap, et-> ((SuggestElevateWordToLabel)et).getLabelTypeId(),(et,vl)->((SuggestElevateWordToLabel) et).setLabelTypeId(DfTypeUtil.toString(vl)), "labelTypeId"); } @Override @@ -96,41 +95,22 @@ public class SuggestElevateWordToLabelDbm extends AbstractDBMeta { protected final String _tableDbName = "suggest_elevate_word_to_label"; protected final String _tableDispName = "suggest_elevate_word_to_label"; protected final String _tablePropertyName = "SuggestElevateWordToLabel"; - - public String getTableDbName() { - return _tableDbName; - } - + public String getTableDbName() { return _tableDbName; } @Override - public String getTableDispName() { - return _tableDispName; - } - + public String getTableDispName() { return _tableDispName; } @Override - public String getTablePropertyName() { - return _tablePropertyName; - } - + public String getTablePropertyName() { return _tablePropertyName; } @Override - public TableSqlName getTableSqlName() { - return null; - } + public TableSqlName getTableSqlName() { return null; } // =================================================================================== // Column Info // =========== - protected final ColumnInfo _columnSuggestElevateWordId = cci("suggestElevateWordId", "suggestElevateWordId", null, null, String.class, - "suggestElevateWordId", null, false, false, false, "String", 0, 0, null, false, null, null, null, null, null, false); - protected final ColumnInfo _columnLabelTypeId = cci("labelTypeId", "labelTypeId", null, null, String.class, "labelTypeId", null, false, - false, false, "String", 0, 0, null, false, null, null, null, null, null, false); + protected final ColumnInfo _columnSuggestElevateWordId = cci("suggestElevateWordId", "suggestElevateWordId", null, null, String.class, "suggestElevateWordId", null, false, false, false, "String", 0, 0, null, false, null, null, null, null, null, false); + protected final ColumnInfo _columnLabelTypeId = cci("labelTypeId", "labelTypeId", null, null, String.class, "labelTypeId", null, false, false, false, "String", 0, 0, null, false, null, null, null, null, null, false); - public ColumnInfo columnSuggestElevateWordId() { - return _columnSuggestElevateWordId; - } - - public ColumnInfo columnLabelTypeId() { - return _columnLabelTypeId; - } + public ColumnInfo columnSuggestElevateWordId() { return _columnSuggestElevateWordId; } + public ColumnInfo columnLabelTypeId() { return _columnLabelTypeId; } protected List ccil() { List ls = newArrayList(); @@ -212,3 +192,4 @@ public class SuggestElevateWordToLabelDbm extends AbstractDBMeta { return null; } } + diff --git a/src/main/java/org/codelibs/fess/es/config/bsentity/dbmeta/WebAuthenticationDbm.java b/src/main/java/org/codelibs/fess/es/config/bsentity/dbmeta/WebAuthenticationDbm.java index 2ca0e904c..a927e863e 100644 --- a/src/main/java/org/codelibs/fess/es/config/bsentity/dbmeta/WebAuthenticationDbm.java +++ b/src/main/java/org/codelibs/fess/es/config/bsentity/dbmeta/WebAuthenticationDbm.java @@ -15,11 +15,12 @@ */ package org.codelibs.fess.es.config.bsentity.dbmeta; -import java.time.LocalDateTime; +import java.time.*; import java.util.List; import java.util.Map; import org.codelibs.fess.es.config.exentity.WebAuthentication; + import org.dbflute.Entity; import org.dbflute.dbmeta.AbstractDBMeta; import org.dbflute.dbmeta.info.ColumnInfo; @@ -79,30 +80,18 @@ public class WebAuthenticationDbm extends AbstractDBMeta { // --------------- protected final Map _epgMap = newHashMap(); { - setupEpg(_epgMap, et -> ((WebAuthentication) et).getAuthRealm(), - (et, vl) -> ((WebAuthentication) et).setAuthRealm(DfTypeUtil.toString(vl)), "authRealm"); - setupEpg(_epgMap, et -> ((WebAuthentication) et).getCreatedBy(), - (et, vl) -> ((WebAuthentication) et).setCreatedBy(DfTypeUtil.toString(vl)), "createdBy"); - setupEpg(_epgMap, et -> ((WebAuthentication) et).getCreatedTime(), - (et, vl) -> ((WebAuthentication) et).setCreatedTime(DfTypeUtil.toLong(vl)), "createdTime"); - setupEpg(_epgMap, et -> ((WebAuthentication) et).getHostname(), - (et, vl) -> ((WebAuthentication) et).setHostname(DfTypeUtil.toString(vl)), "hostname"); - setupEpg(_epgMap, et -> ((WebAuthentication) et).getParameters(), - (et, vl) -> ((WebAuthentication) et).setParameters(DfTypeUtil.toString(vl)), "parameters"); - setupEpg(_epgMap, et -> ((WebAuthentication) et).getPassword(), - (et, vl) -> ((WebAuthentication) et).setPassword(DfTypeUtil.toString(vl)), "password"); - setupEpg(_epgMap, et -> ((WebAuthentication) et).getPort(), (et, vl) -> ((WebAuthentication) et).setPort(DfTypeUtil.toInteger(vl)), - "port"); - setupEpg(_epgMap, et -> ((WebAuthentication) et).getProtocolScheme(), - (et, vl) -> ((WebAuthentication) et).setProtocolScheme(DfTypeUtil.toString(vl)), "protocolScheme"); - setupEpg(_epgMap, et -> ((WebAuthentication) et).getUpdatedBy(), - (et, vl) -> ((WebAuthentication) et).setUpdatedBy(DfTypeUtil.toString(vl)), "updatedBy"); - setupEpg(_epgMap, et -> ((WebAuthentication) et).getUpdatedTime(), - (et, vl) -> ((WebAuthentication) et).setUpdatedTime(DfTypeUtil.toLong(vl)), "updatedTime"); - setupEpg(_epgMap, et -> ((WebAuthentication) et).getUsername(), - (et, vl) -> ((WebAuthentication) et).setUsername(DfTypeUtil.toString(vl)), "username"); - setupEpg(_epgMap, et -> ((WebAuthentication) et).getWebConfigId(), - (et, vl) -> ((WebAuthentication) et).setWebConfigId(DfTypeUtil.toString(vl)), "webConfigId"); + setupEpg(_epgMap, et-> ((WebAuthentication)et).getAuthRealm(),(et,vl)->((WebAuthentication) et).setAuthRealm(DfTypeUtil.toString(vl)), "authRealm"); + setupEpg(_epgMap, et-> ((WebAuthentication)et).getCreatedBy(),(et,vl)->((WebAuthentication) et).setCreatedBy(DfTypeUtil.toString(vl)), "createdBy"); + setupEpg(_epgMap, et-> ((WebAuthentication)et).getCreatedTime(),(et,vl)->((WebAuthentication) et).setCreatedTime(DfTypeUtil.toLong(vl)), "createdTime"); + setupEpg(_epgMap, et-> ((WebAuthentication)et).getHostname(),(et,vl)->((WebAuthentication) et).setHostname(DfTypeUtil.toString(vl)), "hostname"); + setupEpg(_epgMap, et-> ((WebAuthentication)et).getParameters(),(et,vl)->((WebAuthentication) et).setParameters(DfTypeUtil.toString(vl)), "parameters"); + setupEpg(_epgMap, et-> ((WebAuthentication)et).getPassword(),(et,vl)->((WebAuthentication) et).setPassword(DfTypeUtil.toString(vl)), "password"); + setupEpg(_epgMap, et-> ((WebAuthentication)et).getPort(),(et,vl)->((WebAuthentication) et).setPort(DfTypeUtil.toInteger(vl)), "port"); + setupEpg(_epgMap, et-> ((WebAuthentication)et).getProtocolScheme(),(et,vl)->((WebAuthentication) et).setProtocolScheme(DfTypeUtil.toString(vl)), "protocolScheme"); + setupEpg(_epgMap, et-> ((WebAuthentication)et).getUpdatedBy(),(et,vl)->((WebAuthentication) et).setUpdatedBy(DfTypeUtil.toString(vl)), "updatedBy"); + setupEpg(_epgMap, et-> ((WebAuthentication)et).getUpdatedTime(),(et,vl)->((WebAuthentication) et).setUpdatedTime(DfTypeUtil.toLong(vl)), "updatedTime"); + setupEpg(_epgMap, et-> ((WebAuthentication)et).getUsername(),(et,vl)->((WebAuthentication) et).setUsername(DfTypeUtil.toString(vl)), "username"); + setupEpg(_epgMap, et-> ((WebAuthentication)et).getWebConfigId(),(et,vl)->((WebAuthentication) et).setWebConfigId(DfTypeUtil.toString(vl)), "webConfigId"); } @Override @@ -116,101 +105,42 @@ public class WebAuthenticationDbm extends AbstractDBMeta { protected final String _tableDbName = "web_authentication"; protected final String _tableDispName = "web_authentication"; protected final String _tablePropertyName = "WebAuthentication"; - - public String getTableDbName() { - return _tableDbName; - } - + public String getTableDbName() { return _tableDbName; } @Override - public String getTableDispName() { - return _tableDispName; - } - + public String getTableDispName() { return _tableDispName; } @Override - public String getTablePropertyName() { - return _tablePropertyName; - } - + public String getTablePropertyName() { return _tablePropertyName; } @Override - public TableSqlName getTableSqlName() { - return null; - } + public TableSqlName getTableSqlName() { return null; } // =================================================================================== // Column Info // =========== - protected final ColumnInfo _columnAuthRealm = cci("authRealm", "authRealm", null, null, String.class, "authRealm", null, false, false, - false, "String", 0, 0, null, false, null, null, null, null, null, false); - protected final ColumnInfo _columnCreatedBy = cci("createdBy", "createdBy", null, null, String.class, "createdBy", null, false, false, - false, "String", 0, 0, null, false, null, null, null, null, null, false); - protected final ColumnInfo _columnCreatedTime = cci("createdTime", "createdTime", null, null, Long.class, "createdTime", null, false, - false, false, "Long", 0, 0, null, false, null, null, null, null, null, false); - protected final ColumnInfo _columnHostname = cci("hostname", "hostname", null, null, String.class, "hostname", null, false, false, - false, "String", 0, 0, null, false, null, null, null, null, null, false); - protected final ColumnInfo _columnParameters = cci("parameters", "parameters", null, null, String.class, "parameters", null, false, - false, false, "String", 0, 0, null, false, null, null, null, null, null, false); - protected final ColumnInfo _columnPassword = cci("password", "password", null, null, String.class, "password", null, false, false, - false, "String", 0, 0, null, false, null, null, null, null, null, false); - protected final ColumnInfo _columnPort = cci("port", "port", null, null, Integer.class, "port", null, false, false, false, "Integer", - 0, 0, null, false, null, null, null, null, null, false); - protected final ColumnInfo _columnProtocolScheme = cci("protocolScheme", "protocolScheme", null, null, String.class, "protocolScheme", - null, false, false, false, "String", 0, 0, null, false, null, null, null, null, null, false); - protected final ColumnInfo _columnUpdatedBy = cci("updatedBy", "updatedBy", null, null, String.class, "updatedBy", null, false, false, - false, "String", 0, 0, null, false, null, null, null, null, null, false); - protected final ColumnInfo _columnUpdatedTime = cci("updatedTime", "updatedTime", null, null, Long.class, "updatedTime", null, false, - false, false, "Long", 0, 0, null, false, null, null, null, null, null, false); - protected final ColumnInfo _columnUsername = cci("username", "username", null, null, String.class, "username", null, false, false, - false, "String", 0, 0, null, false, null, null, null, null, null, false); - protected final ColumnInfo _columnWebConfigId = cci("webConfigId", "webConfigId", null, null, String.class, "webConfigId", null, false, - false, false, "String", 0, 0, null, false, null, null, null, null, null, false); + protected final ColumnInfo _columnAuthRealm = cci("authRealm", "authRealm", null, null, String.class, "authRealm", null, false, false, false, "String", 0, 0, null, false, null, null, null, null, null, false); + protected final ColumnInfo _columnCreatedBy = cci("createdBy", "createdBy", null, null, String.class, "createdBy", null, false, false, false, "String", 0, 0, null, false, null, null, null, null, null, false); + protected final ColumnInfo _columnCreatedTime = cci("createdTime", "createdTime", null, null, Long.class, "createdTime", null, false, false, false, "Long", 0, 0, null, false, null, null, null, null, null, false); + protected final ColumnInfo _columnHostname = cci("hostname", "hostname", null, null, String.class, "hostname", null, false, false, false, "String", 0, 0, null, false, null, null, null, null, null, false); + protected final ColumnInfo _columnParameters = cci("parameters", "parameters", null, null, String.class, "parameters", null, false, false, false, "String", 0, 0, null, false, null, null, null, null, null, false); + protected final ColumnInfo _columnPassword = cci("password", "password", null, null, String.class, "password", null, false, false, false, "String", 0, 0, null, false, null, null, null, null, null, false); + protected final ColumnInfo _columnPort = cci("port", "port", null, null, Integer.class, "port", null, false, false, false, "Integer", 0, 0, null, false, null, null, null, null, null, false); + protected final ColumnInfo _columnProtocolScheme = cci("protocolScheme", "protocolScheme", null, null, String.class, "protocolScheme", null, false, false, false, "String", 0, 0, null, false, null, null, null, null, null, false); + protected final ColumnInfo _columnUpdatedBy = cci("updatedBy", "updatedBy", null, null, String.class, "updatedBy", null, false, false, false, "String", 0, 0, null, false, null, null, null, null, null, false); + protected final ColumnInfo _columnUpdatedTime = cci("updatedTime", "updatedTime", null, null, Long.class, "updatedTime", null, false, false, false, "Long", 0, 0, null, false, null, null, null, null, null, false); + protected final ColumnInfo _columnUsername = cci("username", "username", null, null, String.class, "username", null, false, false, false, "String", 0, 0, null, false, null, null, null, null, null, false); + protected final ColumnInfo _columnWebConfigId = cci("webConfigId", "webConfigId", null, null, String.class, "webConfigId", null, false, false, false, "String", 0, 0, null, false, null, null, null, null, null, false); - public ColumnInfo columnAuthRealm() { - return _columnAuthRealm; - } - - public ColumnInfo columnCreatedBy() { - return _columnCreatedBy; - } - - public ColumnInfo columnCreatedTime() { - return _columnCreatedTime; - } - - public ColumnInfo columnHostname() { - return _columnHostname; - } - - public ColumnInfo columnParameters() { - return _columnParameters; - } - - public ColumnInfo columnPassword() { - return _columnPassword; - } - - public ColumnInfo columnPort() { - return _columnPort; - } - - public ColumnInfo columnProtocolScheme() { - return _columnProtocolScheme; - } - - public ColumnInfo columnUpdatedBy() { - return _columnUpdatedBy; - } - - public ColumnInfo columnUpdatedTime() { - return _columnUpdatedTime; - } - - public ColumnInfo columnUsername() { - return _columnUsername; - } - - public ColumnInfo columnWebConfigId() { - return _columnWebConfigId; - } + public ColumnInfo columnAuthRealm() { return _columnAuthRealm; } + public ColumnInfo columnCreatedBy() { return _columnCreatedBy; } + public ColumnInfo columnCreatedTime() { return _columnCreatedTime; } + public ColumnInfo columnHostname() { return _columnHostname; } + public ColumnInfo columnParameters() { return _columnParameters; } + public ColumnInfo columnPassword() { return _columnPassword; } + public ColumnInfo columnPort() { return _columnPort; } + public ColumnInfo columnProtocolScheme() { return _columnProtocolScheme; } + public ColumnInfo columnUpdatedBy() { return _columnUpdatedBy; } + public ColumnInfo columnUpdatedTime() { return _columnUpdatedTime; } + public ColumnInfo columnUsername() { return _columnUsername; } + public ColumnInfo columnWebConfigId() { return _columnWebConfigId; } protected List ccil() { List ls = newArrayList(); @@ -302,3 +232,4 @@ public class WebAuthenticationDbm extends AbstractDBMeta { return null; } } + diff --git a/src/main/java/org/codelibs/fess/es/config/bsentity/dbmeta/WebConfigDbm.java b/src/main/java/org/codelibs/fess/es/config/bsentity/dbmeta/WebConfigDbm.java index ca1d4eb6d..ed7c73f99 100644 --- a/src/main/java/org/codelibs/fess/es/config/bsentity/dbmeta/WebConfigDbm.java +++ b/src/main/java/org/codelibs/fess/es/config/bsentity/dbmeta/WebConfigDbm.java @@ -15,11 +15,12 @@ */ package org.codelibs.fess.es.config.bsentity.dbmeta; -import java.time.LocalDateTime; +import java.time.*; import java.util.List; import java.util.Map; import org.codelibs.fess.es.config.exentity.WebConfig; + import org.dbflute.Entity; import org.dbflute.dbmeta.AbstractDBMeta; import org.dbflute.dbmeta.info.ColumnInfo; @@ -79,42 +80,26 @@ public class WebConfigDbm extends AbstractDBMeta { // --------------- protected final Map _epgMap = newHashMap(); { - setupEpg(_epgMap, et -> ((WebConfig) et).getAvailable(), (et, vl) -> ((WebConfig) et).setAvailable(DfTypeUtil.toBoolean(vl)), - "available"); - setupEpg(_epgMap, et -> ((WebConfig) et).getBoost(), (et, vl) -> ((WebConfig) et).setBoost(DfTypeUtil.toFloat(vl)), "boost"); - setupEpg(_epgMap, et -> ((WebConfig) et).getConfigParameter(), - (et, vl) -> ((WebConfig) et).setConfigParameter(DfTypeUtil.toString(vl)), "configParameter"); - setupEpg(_epgMap, et -> ((WebConfig) et).getCreatedBy(), (et, vl) -> ((WebConfig) et).setCreatedBy(DfTypeUtil.toString(vl)), - "createdBy"); - setupEpg(_epgMap, et -> ((WebConfig) et).getCreatedTime(), (et, vl) -> ((WebConfig) et).setCreatedTime(DfTypeUtil.toLong(vl)), - "createdTime"); - setupEpg(_epgMap, et -> ((WebConfig) et).getDepth(), (et, vl) -> ((WebConfig) et).setDepth(DfTypeUtil.toInteger(vl)), "depth"); - setupEpg(_epgMap, et -> ((WebConfig) et).getExcludedDocUrls(), - (et, vl) -> ((WebConfig) et).setExcludedDocUrls(DfTypeUtil.toString(vl)), "excludedDocUrls"); - setupEpg(_epgMap, et -> ((WebConfig) et).getExcludedUrls(), (et, vl) -> ((WebConfig) et).setExcludedUrls(DfTypeUtil.toString(vl)), - "excludedUrls"); - setupEpg(_epgMap, et -> ((WebConfig) et).getIncludedDocUrls(), - (et, vl) -> ((WebConfig) et).setIncludedDocUrls(DfTypeUtil.toString(vl)), "includedDocUrls"); - setupEpg(_epgMap, et -> ((WebConfig) et).getIncludedUrls(), (et, vl) -> ((WebConfig) et).setIncludedUrls(DfTypeUtil.toString(vl)), - "includedUrls"); - setupEpg(_epgMap, et -> ((WebConfig) et).getIntervalTime(), (et, vl) -> ((WebConfig) et).setIntervalTime(DfTypeUtil.toInteger(vl)), - "intervalTime"); - setupEpg(_epgMap, et -> ((WebConfig) et).getTimeToLive(), (et, vl) -> ((WebConfig) et).setTimeToLive(DfTypeUtil.toInteger(vl)), - "timeToLive"); - setupEpg(_epgMap, et -> ((WebConfig) et).getMaxAccessCount(), - (et, vl) -> ((WebConfig) et).setMaxAccessCount(DfTypeUtil.toLong(vl)), "maxAccessCount"); - setupEpg(_epgMap, et -> ((WebConfig) et).getName(), (et, vl) -> ((WebConfig) et).setName(DfTypeUtil.toString(vl)), "name"); - setupEpg(_epgMap, et -> ((WebConfig) et).getNumOfThread(), (et, vl) -> ((WebConfig) et).setNumOfThread(DfTypeUtil.toInteger(vl)), - "numOfThread"); - setupEpg(_epgMap, et -> ((WebConfig) et).getSortOrder(), (et, vl) -> ((WebConfig) et).setSortOrder(DfTypeUtil.toInteger(vl)), - "sortOrder"); - setupEpg(_epgMap, et -> ((WebConfig) et).getUpdatedBy(), (et, vl) -> ((WebConfig) et).setUpdatedBy(DfTypeUtil.toString(vl)), - "updatedBy"); - setupEpg(_epgMap, et -> ((WebConfig) et).getUpdatedTime(), (et, vl) -> ((WebConfig) et).setUpdatedTime(DfTypeUtil.toLong(vl)), - "updatedTime"); - setupEpg(_epgMap, et -> ((WebConfig) et).getUrls(), (et, vl) -> ((WebConfig) et).setUrls(DfTypeUtil.toString(vl)), "urls"); - setupEpg(_epgMap, et -> ((WebConfig) et).getUserAgent(), (et, vl) -> ((WebConfig) et).setUserAgent(DfTypeUtil.toString(vl)), - "userAgent"); + setupEpg(_epgMap, et-> ((WebConfig)et).getAvailable(),(et,vl)->((WebConfig) et).setAvailable(DfTypeUtil.toBoolean(vl)), "available"); + setupEpg(_epgMap, et-> ((WebConfig)et).getBoost(),(et,vl)->((WebConfig) et).setBoost(DfTypeUtil.toFloat(vl)), "boost"); + setupEpg(_epgMap, et-> ((WebConfig)et).getConfigParameter(),(et,vl)->((WebConfig) et).setConfigParameter(DfTypeUtil.toString(vl)), "configParameter"); + setupEpg(_epgMap, et-> ((WebConfig)et).getCreatedBy(),(et,vl)->((WebConfig) et).setCreatedBy(DfTypeUtil.toString(vl)), "createdBy"); + setupEpg(_epgMap, et-> ((WebConfig)et).getCreatedTime(),(et,vl)->((WebConfig) et).setCreatedTime(DfTypeUtil.toLong(vl)), "createdTime"); + setupEpg(_epgMap, et-> ((WebConfig)et).getDepth(),(et,vl)->((WebConfig) et).setDepth(DfTypeUtil.toInteger(vl)), "depth"); + setupEpg(_epgMap, et-> ((WebConfig)et).getExcludedDocUrls(),(et,vl)->((WebConfig) et).setExcludedDocUrls(DfTypeUtil.toString(vl)), "excludedDocUrls"); + setupEpg(_epgMap, et-> ((WebConfig)et).getExcludedUrls(),(et,vl)->((WebConfig) et).setExcludedUrls(DfTypeUtil.toString(vl)), "excludedUrls"); + setupEpg(_epgMap, et-> ((WebConfig)et).getIncludedDocUrls(),(et,vl)->((WebConfig) et).setIncludedDocUrls(DfTypeUtil.toString(vl)), "includedDocUrls"); + setupEpg(_epgMap, et-> ((WebConfig)et).getIncludedUrls(),(et,vl)->((WebConfig) et).setIncludedUrls(DfTypeUtil.toString(vl)), "includedUrls"); + setupEpg(_epgMap, et-> ((WebConfig)et).getIntervalTime(),(et,vl)->((WebConfig) et).setIntervalTime(DfTypeUtil.toInteger(vl)), "intervalTime"); + setupEpg(_epgMap, et-> ((WebConfig)et).getTimeToLive(),(et,vl)->((WebConfig) et).setTimeToLive(DfTypeUtil.toInteger(vl)), "timeToLive"); + setupEpg(_epgMap, et-> ((WebConfig)et).getMaxAccessCount(),(et,vl)->((WebConfig) et).setMaxAccessCount(DfTypeUtil.toLong(vl)), "maxAccessCount"); + setupEpg(_epgMap, et-> ((WebConfig)et).getName(),(et,vl)->((WebConfig) et).setName(DfTypeUtil.toString(vl)), "name"); + setupEpg(_epgMap, et-> ((WebConfig)et).getNumOfThread(),(et,vl)->((WebConfig) et).setNumOfThread(DfTypeUtil.toInteger(vl)), "numOfThread"); + setupEpg(_epgMap, et-> ((WebConfig)et).getSortOrder(),(et,vl)->((WebConfig) et).setSortOrder(DfTypeUtil.toInteger(vl)), "sortOrder"); + setupEpg(_epgMap, et-> ((WebConfig)et).getUpdatedBy(),(et,vl)->((WebConfig) et).setUpdatedBy(DfTypeUtil.toString(vl)), "updatedBy"); + setupEpg(_epgMap, et-> ((WebConfig)et).getUpdatedTime(),(et,vl)->((WebConfig) et).setUpdatedTime(DfTypeUtil.toLong(vl)), "updatedTime"); + setupEpg(_epgMap, et-> ((WebConfig)et).getUrls(),(et,vl)->((WebConfig) et).setUrls(DfTypeUtil.toString(vl)), "urls"); + setupEpg(_epgMap, et-> ((WebConfig)et).getUserAgent(),(et,vl)->((WebConfig) et).setUserAgent(DfTypeUtil.toString(vl)), "userAgent"); } @Override @@ -128,149 +113,58 @@ public class WebConfigDbm extends AbstractDBMeta { protected final String _tableDbName = "web_config"; protected final String _tableDispName = "web_config"; protected final String _tablePropertyName = "WebConfig"; - - public String getTableDbName() { - return _tableDbName; - } - + public String getTableDbName() { return _tableDbName; } @Override - public String getTableDispName() { - return _tableDispName; - } - + public String getTableDispName() { return _tableDispName; } @Override - public String getTablePropertyName() { - return _tablePropertyName; - } - + public String getTablePropertyName() { return _tablePropertyName; } @Override - public TableSqlName getTableSqlName() { - return null; - } + public TableSqlName getTableSqlName() { return null; } // =================================================================================== // Column Info // =========== - protected final ColumnInfo _columnAvailable = cci("available", "available", null, null, Boolean.class, "available", null, false, false, - false, "Boolean", 0, 0, null, false, null, null, null, null, null, false); - protected final ColumnInfo _columnBoost = cci("boost", "boost", null, null, Float.class, "boost", null, false, false, false, "Float", - 0, 0, null, false, null, null, null, null, null, false); - protected final ColumnInfo _columnConfigParameter = cci("configParameter", "configParameter", null, null, String.class, - "configParameter", null, false, false, false, "String", 0, 0, null, false, null, null, null, null, null, false); - protected final ColumnInfo _columnCreatedBy = cci("createdBy", "createdBy", null, null, String.class, "createdBy", null, false, false, - false, "String", 0, 0, null, false, null, null, null, null, null, false); - protected final ColumnInfo _columnCreatedTime = cci("createdTime", "createdTime", null, null, Long.class, "createdTime", null, false, - false, false, "Long", 0, 0, null, false, null, null, null, null, null, false); - protected final ColumnInfo _columnDepth = cci("depth", "depth", null, null, Integer.class, "depth", null, false, false, false, - "Integer", 0, 0, null, false, null, null, null, null, null, false); - protected final ColumnInfo _columnExcludedDocUrls = cci("excludedDocUrls", "excludedDocUrls", null, null, String.class, - "excludedDocUrls", null, false, false, false, "String", 0, 0, null, false, null, null, null, null, null, false); - protected final ColumnInfo _columnExcludedUrls = cci("excludedUrls", "excludedUrls", null, null, String.class, "excludedUrls", null, - false, false, false, "String", 0, 0, null, false, null, null, null, null, null, false); - protected final ColumnInfo _columnIncludedDocUrls = cci("includedDocUrls", "includedDocUrls", null, null, String.class, - "includedDocUrls", null, false, false, false, "String", 0, 0, null, false, null, null, null, null, null, false); - protected final ColumnInfo _columnIncludedUrls = cci("includedUrls", "includedUrls", null, null, String.class, "includedUrls", null, - false, false, false, "String", 0, 0, null, false, null, null, null, null, null, false); - protected final ColumnInfo _columnIntervalTime = cci("intervalTime", "intervalTime", null, null, Integer.class, "intervalTime", null, - false, false, false, "Integer", 0, 0, null, false, null, null, null, null, null, false); - protected final ColumnInfo _columnTimeToLive = cci("timeToLive", "timeToLive", null, null, Integer.class, "timeToLive", null, false, - false, false, "Integer", 0, 0, null, false, null, null, null, null, null, false); - protected final ColumnInfo _columnMaxAccessCount = cci("maxAccessCount", "maxAccessCount", null, null, Long.class, "maxAccessCount", - null, false, false, false, "Long", 0, 0, null, false, null, null, null, null, null, false); - protected final ColumnInfo _columnName = cci("name", "name", null, null, String.class, "name", null, false, false, false, "String", 0, - 0, null, false, null, null, null, null, null, false); - protected final ColumnInfo _columnNumOfThread = cci("numOfThread", "numOfThread", null, null, Integer.class, "numOfThread", null, - false, false, false, "Integer", 0, 0, null, false, null, null, null, null, null, false); - protected final ColumnInfo _columnSortOrder = cci("sortOrder", "sortOrder", null, null, Integer.class, "sortOrder", null, false, false, - false, "Integer", 0, 0, null, false, null, null, null, null, null, false); - protected final ColumnInfo _columnUpdatedBy = cci("updatedBy", "updatedBy", null, null, String.class, "updatedBy", null, false, false, - false, "String", 0, 0, null, false, null, null, null, null, null, false); - protected final ColumnInfo _columnUpdatedTime = cci("updatedTime", "updatedTime", null, null, Long.class, "updatedTime", null, false, - false, false, "Long", 0, 0, null, false, null, null, null, null, null, false); - protected final ColumnInfo _columnUrls = cci("urls", "urls", null, null, String.class, "urls", null, false, false, false, "String", 0, - 0, null, false, null, null, null, null, null, false); - protected final ColumnInfo _columnUserAgent = cci("userAgent", "userAgent", null, null, String.class, "userAgent", null, false, false, - false, "String", 0, 0, null, false, null, null, null, null, null, false); + protected final ColumnInfo _columnAvailable = cci("available", "available", null, null, Boolean.class, "available", null, false, false, false, "Boolean", 0, 0, null, false, null, null, null, null, null, false); + protected final ColumnInfo _columnBoost = cci("boost", "boost", null, null, Float.class, "boost", null, false, false, false, "Float", 0, 0, null, false, null, null, null, null, null, false); + protected final ColumnInfo _columnConfigParameter = cci("configParameter", "configParameter", null, null, String.class, "configParameter", null, false, false, false, "String", 0, 0, null, false, null, null, null, null, null, false); + protected final ColumnInfo _columnCreatedBy = cci("createdBy", "createdBy", null, null, String.class, "createdBy", null, false, false, false, "String", 0, 0, null, false, null, null, null, null, null, false); + protected final ColumnInfo _columnCreatedTime = cci("createdTime", "createdTime", null, null, Long.class, "createdTime", null, false, false, false, "Long", 0, 0, null, false, null, null, null, null, null, false); + protected final ColumnInfo _columnDepth = cci("depth", "depth", null, null, Integer.class, "depth", null, false, false, false, "Integer", 0, 0, null, false, null, null, null, null, null, false); + protected final ColumnInfo _columnExcludedDocUrls = cci("excludedDocUrls", "excludedDocUrls", null, null, String.class, "excludedDocUrls", null, false, false, false, "String", 0, 0, null, false, null, null, null, null, null, false); + protected final ColumnInfo _columnExcludedUrls = cci("excludedUrls", "excludedUrls", null, null, String.class, "excludedUrls", null, false, false, false, "String", 0, 0, null, false, null, null, null, null, null, false); + protected final ColumnInfo _columnIncludedDocUrls = cci("includedDocUrls", "includedDocUrls", null, null, String.class, "includedDocUrls", null, false, false, false, "String", 0, 0, null, false, null, null, null, null, null, false); + protected final ColumnInfo _columnIncludedUrls = cci("includedUrls", "includedUrls", null, null, String.class, "includedUrls", null, false, false, false, "String", 0, 0, null, false, null, null, null, null, null, false); + protected final ColumnInfo _columnIntervalTime = cci("intervalTime", "intervalTime", null, null, Integer.class, "intervalTime", null, false, false, false, "Integer", 0, 0, null, false, null, null, null, null, null, false); + protected final ColumnInfo _columnTimeToLive = cci("timeToLive", "timeToLive", null, null, Integer.class, "timeToLive", null, false, false, false, "Integer", 0, 0, null, false, null, null, null, null, null, false); + protected final ColumnInfo _columnMaxAccessCount = cci("maxAccessCount", "maxAccessCount", null, null, Long.class, "maxAccessCount", null, false, false, false, "Long", 0, 0, null, false, null, null, null, null, null, false); + protected final ColumnInfo _columnName = cci("name", "name", null, null, String.class, "name", null, false, false, false, "String", 0, 0, null, false, null, null, null, null, null, false); + protected final ColumnInfo _columnNumOfThread = cci("numOfThread", "numOfThread", null, null, Integer.class, "numOfThread", null, false, false, false, "Integer", 0, 0, null, false, null, null, null, null, null, false); + protected final ColumnInfo _columnSortOrder = cci("sortOrder", "sortOrder", null, null, Integer.class, "sortOrder", null, false, false, false, "Integer", 0, 0, null, false, null, null, null, null, null, false); + protected final ColumnInfo _columnUpdatedBy = cci("updatedBy", "updatedBy", null, null, String.class, "updatedBy", null, false, false, false, "String", 0, 0, null, false, null, null, null, null, null, false); + protected final ColumnInfo _columnUpdatedTime = cci("updatedTime", "updatedTime", null, null, Long.class, "updatedTime", null, false, false, false, "Long", 0, 0, null, false, null, null, null, null, null, false); + protected final ColumnInfo _columnUrls = cci("urls", "urls", null, null, String.class, "urls", null, false, false, false, "String", 0, 0, null, false, null, null, null, null, null, false); + protected final ColumnInfo _columnUserAgent = cci("userAgent", "userAgent", null, null, String.class, "userAgent", null, false, false, false, "String", 0, 0, null, false, null, null, null, null, null, false); - public ColumnInfo columnAvailable() { - return _columnAvailable; - } - - public ColumnInfo columnBoost() { - return _columnBoost; - } - - public ColumnInfo columnConfigParameter() { - return _columnConfigParameter; - } - - public ColumnInfo columnCreatedBy() { - return _columnCreatedBy; - } - - public ColumnInfo columnCreatedTime() { - return _columnCreatedTime; - } - - public ColumnInfo columnDepth() { - return _columnDepth; - } - - public ColumnInfo columnExcludedDocUrls() { - return _columnExcludedDocUrls; - } - - public ColumnInfo columnExcludedUrls() { - return _columnExcludedUrls; - } - - public ColumnInfo columnIncludedDocUrls() { - return _columnIncludedDocUrls; - } - - public ColumnInfo columnIncludedUrls() { - return _columnIncludedUrls; - } - - public ColumnInfo columnIntervalTime() { - return _columnIntervalTime; - } - - public ColumnInfo columnTimeToLive() { - return _columnTimeToLive; - } - - public ColumnInfo columnMaxAccessCount() { - return _columnMaxAccessCount; - } - - public ColumnInfo columnName() { - return _columnName; - } - - public ColumnInfo columnNumOfThread() { - return _columnNumOfThread; - } - - public ColumnInfo columnSortOrder() { - return _columnSortOrder; - } - - public ColumnInfo columnUpdatedBy() { - return _columnUpdatedBy; - } - - public ColumnInfo columnUpdatedTime() { - return _columnUpdatedTime; - } - - public ColumnInfo columnUrls() { - return _columnUrls; - } - - public ColumnInfo columnUserAgent() { - return _columnUserAgent; - } + public ColumnInfo columnAvailable() { return _columnAvailable; } + public ColumnInfo columnBoost() { return _columnBoost; } + public ColumnInfo columnConfigParameter() { return _columnConfigParameter; } + public ColumnInfo columnCreatedBy() { return _columnCreatedBy; } + public ColumnInfo columnCreatedTime() { return _columnCreatedTime; } + public ColumnInfo columnDepth() { return _columnDepth; } + public ColumnInfo columnExcludedDocUrls() { return _columnExcludedDocUrls; } + public ColumnInfo columnExcludedUrls() { return _columnExcludedUrls; } + public ColumnInfo columnIncludedDocUrls() { return _columnIncludedDocUrls; } + public ColumnInfo columnIncludedUrls() { return _columnIncludedUrls; } + public ColumnInfo columnIntervalTime() { return _columnIntervalTime; } + public ColumnInfo columnTimeToLive() { return _columnTimeToLive; } + public ColumnInfo columnMaxAccessCount() { return _columnMaxAccessCount; } + public ColumnInfo columnName() { return _columnName; } + public ColumnInfo columnNumOfThread() { return _columnNumOfThread; } + public ColumnInfo columnSortOrder() { return _columnSortOrder; } + public ColumnInfo columnUpdatedBy() { return _columnUpdatedBy; } + public ColumnInfo columnUpdatedTime() { return _columnUpdatedTime; } + public ColumnInfo columnUrls() { return _columnUrls; } + public ColumnInfo columnUserAgent() { return _columnUserAgent; } protected List ccil() { List ls = newArrayList(); @@ -370,3 +264,4 @@ public class WebConfigDbm extends AbstractDBMeta { return null; } } + diff --git a/src/main/java/org/codelibs/fess/es/config/bsentity/dbmeta/WebConfigToLabelDbm.java b/src/main/java/org/codelibs/fess/es/config/bsentity/dbmeta/WebConfigToLabelDbm.java index 10c7bb6d5..836733f2f 100644 --- a/src/main/java/org/codelibs/fess/es/config/bsentity/dbmeta/WebConfigToLabelDbm.java +++ b/src/main/java/org/codelibs/fess/es/config/bsentity/dbmeta/WebConfigToLabelDbm.java @@ -15,11 +15,12 @@ */ package org.codelibs.fess.es.config.bsentity.dbmeta; -import java.time.LocalDateTime; +import java.time.*; import java.util.List; import java.util.Map; import org.codelibs.fess.es.config.exentity.WebConfigToLabel; + import org.dbflute.Entity; import org.dbflute.dbmeta.AbstractDBMeta; import org.dbflute.dbmeta.info.ColumnInfo; @@ -79,10 +80,8 @@ public class WebConfigToLabelDbm extends AbstractDBMeta { // --------------- protected final Map _epgMap = newHashMap(); { - setupEpg(_epgMap, et -> ((WebConfigToLabel) et).getLabelTypeId(), - (et, vl) -> ((WebConfigToLabel) et).setLabelTypeId(DfTypeUtil.toString(vl)), "labelTypeId"); - setupEpg(_epgMap, et -> ((WebConfigToLabel) et).getWebConfigId(), - (et, vl) -> ((WebConfigToLabel) et).setWebConfigId(DfTypeUtil.toString(vl)), "webConfigId"); + setupEpg(_epgMap, et-> ((WebConfigToLabel)et).getLabelTypeId(),(et,vl)->((WebConfigToLabel) et).setLabelTypeId(DfTypeUtil.toString(vl)), "labelTypeId"); + setupEpg(_epgMap, et-> ((WebConfigToLabel)et).getWebConfigId(),(et,vl)->((WebConfigToLabel) et).setWebConfigId(DfTypeUtil.toString(vl)), "webConfigId"); } @Override @@ -96,41 +95,22 @@ public class WebConfigToLabelDbm extends AbstractDBMeta { protected final String _tableDbName = "web_config_to_label"; protected final String _tableDispName = "web_config_to_label"; protected final String _tablePropertyName = "WebConfigToLabel"; - - public String getTableDbName() { - return _tableDbName; - } - + public String getTableDbName() { return _tableDbName; } @Override - public String getTableDispName() { - return _tableDispName; - } - + public String getTableDispName() { return _tableDispName; } @Override - public String getTablePropertyName() { - return _tablePropertyName; - } - + public String getTablePropertyName() { return _tablePropertyName; } @Override - public TableSqlName getTableSqlName() { - return null; - } + public TableSqlName getTableSqlName() { return null; } // =================================================================================== // Column Info // =========== - protected final ColumnInfo _columnLabelTypeId = cci("labelTypeId", "labelTypeId", null, null, String.class, "labelTypeId", null, false, - false, false, "String", 0, 0, null, false, null, null, null, null, null, false); - protected final ColumnInfo _columnWebConfigId = cci("webConfigId", "webConfigId", null, null, String.class, "webConfigId", null, false, - false, false, "String", 0, 0, null, false, null, null, null, null, null, false); + protected final ColumnInfo _columnLabelTypeId = cci("labelTypeId", "labelTypeId", null, null, String.class, "labelTypeId", null, false, false, false, "String", 0, 0, null, false, null, null, null, null, null, false); + protected final ColumnInfo _columnWebConfigId = cci("webConfigId", "webConfigId", null, null, String.class, "webConfigId", null, false, false, false, "String", 0, 0, null, false, null, null, null, null, null, false); - public ColumnInfo columnLabelTypeId() { - return _columnLabelTypeId; - } - - public ColumnInfo columnWebConfigId() { - return _columnWebConfigId; - } + public ColumnInfo columnLabelTypeId() { return _columnLabelTypeId; } + public ColumnInfo columnWebConfigId() { return _columnWebConfigId; } protected List ccil() { List ls = newArrayList(); @@ -212,3 +192,4 @@ public class WebConfigToLabelDbm extends AbstractDBMeta { return null; } } + diff --git a/src/main/java/org/codelibs/fess/es/config/bsentity/dbmeta/WebConfigToRoleDbm.java b/src/main/java/org/codelibs/fess/es/config/bsentity/dbmeta/WebConfigToRoleDbm.java index 6a19ef2ee..57709434b 100644 --- a/src/main/java/org/codelibs/fess/es/config/bsentity/dbmeta/WebConfigToRoleDbm.java +++ b/src/main/java/org/codelibs/fess/es/config/bsentity/dbmeta/WebConfigToRoleDbm.java @@ -15,11 +15,12 @@ */ package org.codelibs.fess.es.config.bsentity.dbmeta; -import java.time.LocalDateTime; +import java.time.*; import java.util.List; import java.util.Map; import org.codelibs.fess.es.config.exentity.WebConfigToRole; + import org.dbflute.Entity; import org.dbflute.dbmeta.AbstractDBMeta; import org.dbflute.dbmeta.info.ColumnInfo; @@ -79,10 +80,8 @@ public class WebConfigToRoleDbm extends AbstractDBMeta { // --------------- protected final Map _epgMap = newHashMap(); { - setupEpg(_epgMap, et -> ((WebConfigToRole) et).getRoleTypeId(), - (et, vl) -> ((WebConfigToRole) et).setRoleTypeId(DfTypeUtil.toString(vl)), "roleTypeId"); - setupEpg(_epgMap, et -> ((WebConfigToRole) et).getWebConfigId(), - (et, vl) -> ((WebConfigToRole) et).setWebConfigId(DfTypeUtil.toString(vl)), "webConfigId"); + setupEpg(_epgMap, et-> ((WebConfigToRole)et).getRoleTypeId(),(et,vl)->((WebConfigToRole) et).setRoleTypeId(DfTypeUtil.toString(vl)), "roleTypeId"); + setupEpg(_epgMap, et-> ((WebConfigToRole)et).getWebConfigId(),(et,vl)->((WebConfigToRole) et).setWebConfigId(DfTypeUtil.toString(vl)), "webConfigId"); } @Override @@ -96,41 +95,22 @@ public class WebConfigToRoleDbm extends AbstractDBMeta { protected final String _tableDbName = "web_config_to_role"; protected final String _tableDispName = "web_config_to_role"; protected final String _tablePropertyName = "WebConfigToRole"; - - public String getTableDbName() { - return _tableDbName; - } - + public String getTableDbName() { return _tableDbName; } @Override - public String getTableDispName() { - return _tableDispName; - } - + public String getTableDispName() { return _tableDispName; } @Override - public String getTablePropertyName() { - return _tablePropertyName; - } - + public String getTablePropertyName() { return _tablePropertyName; } @Override - public TableSqlName getTableSqlName() { - return null; - } + public TableSqlName getTableSqlName() { return null; } // =================================================================================== // Column Info // =========== - protected final ColumnInfo _columnRoleTypeId = cci("roleTypeId", "roleTypeId", null, null, String.class, "roleTypeId", null, false, - false, false, "String", 0, 0, null, false, null, null, null, null, null, false); - protected final ColumnInfo _columnWebConfigId = cci("webConfigId", "webConfigId", null, null, String.class, "webConfigId", null, false, - false, false, "String", 0, 0, null, false, null, null, null, null, null, false); + protected final ColumnInfo _columnRoleTypeId = cci("roleTypeId", "roleTypeId", null, null, String.class, "roleTypeId", null, false, false, false, "String", 0, 0, null, false, null, null, null, null, null, false); + protected final ColumnInfo _columnWebConfigId = cci("webConfigId", "webConfigId", null, null, String.class, "webConfigId", null, false, false, false, "String", 0, 0, null, false, null, null, null, null, null, false); - public ColumnInfo columnRoleTypeId() { - return _columnRoleTypeId; - } - - public ColumnInfo columnWebConfigId() { - return _columnWebConfigId; - } + public ColumnInfo columnRoleTypeId() { return _columnRoleTypeId; } + public ColumnInfo columnWebConfigId() { return _columnWebConfigId; } protected List ccil() { List ls = newArrayList(); @@ -212,3 +192,4 @@ public class WebConfigToRoleDbm extends AbstractDBMeta { return null; } } + diff --git a/src/main/java/org/codelibs/fess/es/config/cbean/CrawlingSessionCB.java b/src/main/java/org/codelibs/fess/es/config/cbean/CrawlingInfoCB.java similarity index 84% rename from src/main/java/org/codelibs/fess/es/config/cbean/CrawlingSessionCB.java rename to src/main/java/org/codelibs/fess/es/config/cbean/CrawlingInfoCB.java index 9bd05379d..7dba9c37d 100644 --- a/src/main/java/org/codelibs/fess/es/config/cbean/CrawlingSessionCB.java +++ b/src/main/java/org/codelibs/fess/es/config/cbean/CrawlingInfoCB.java @@ -15,10 +15,10 @@ */ package org.codelibs.fess.es.config.cbean; -import org.codelibs.fess.es.config.cbean.bs.BsCrawlingSessionCB; +import org.codelibs.fess.es.config.cbean.bs.BsCrawlingInfoCB; /** * @author ESFlute (using FreeGen) */ -public class CrawlingSessionCB extends BsCrawlingSessionCB { +public class CrawlingInfoCB extends BsCrawlingInfoCB { } diff --git a/src/main/java/org/codelibs/fess/es/config/cbean/CrawlingSessionInfoCB.java b/src/main/java/org/codelibs/fess/es/config/cbean/CrawlingInfoParamCB.java similarity index 83% rename from src/main/java/org/codelibs/fess/es/config/cbean/CrawlingSessionInfoCB.java rename to src/main/java/org/codelibs/fess/es/config/cbean/CrawlingInfoParamCB.java index 838390b9a..70a49e8ab 100644 --- a/src/main/java/org/codelibs/fess/es/config/cbean/CrawlingSessionInfoCB.java +++ b/src/main/java/org/codelibs/fess/es/config/cbean/CrawlingInfoParamCB.java @@ -15,10 +15,10 @@ */ package org.codelibs.fess.es.config.cbean; -import org.codelibs.fess.es.config.cbean.bs.BsCrawlingSessionInfoCB; +import org.codelibs.fess.es.config.cbean.bs.BsCrawlingInfoParamCB; /** * @author ESFlute (using FreeGen) */ -public class CrawlingSessionInfoCB extends BsCrawlingSessionInfoCB { +public class CrawlingInfoParamCB extends BsCrawlingInfoParamCB { } diff --git a/src/main/java/org/codelibs/fess/es/config/cbean/bs/BsBoostDocumentRuleCB.java b/src/main/java/org/codelibs/fess/es/config/cbean/bs/BsBoostDocumentRuleCB.java index 252ab500a..12a848dfb 100644 --- a/src/main/java/org/codelibs/fess/es/config/cbean/bs/BsBoostDocumentRuleCB.java +++ b/src/main/java/org/codelibs/fess/es/config/cbean/bs/BsBoostDocumentRuleCB.java @@ -75,7 +75,7 @@ public class BsBoostDocumentRuleCB extends EsAbstractConditionBean { @Override public void acceptPrimaryKeyMap(Map primaryKeyMap) { - acceptPK((String) primaryKeyMap.get("_id")); + acceptPK((String)primaryKeyMap.get("_id")); } // =================================================================================== @@ -161,27 +161,21 @@ public class BsBoostDocumentRuleCB extends EsAbstractConditionBean { public void columnBoostExpr() { doColumn("boostExpr"); } - public void columnCreatedBy() { doColumn("createdBy"); } - public void columnCreatedTime() { doColumn("createdTime"); } - public void columnSortOrder() { doColumn("sortOrder"); } - public void columnUpdatedBy() { doColumn("updatedBy"); } - public void columnUpdatedTime() { doColumn("updatedTime"); } - public void columnUrlExpr() { doColumn("urlExpr"); } diff --git a/src/main/java/org/codelibs/fess/es/config/cbean/bs/BsCrawlingSessionCB.java b/src/main/java/org/codelibs/fess/es/config/cbean/bs/BsCrawlingInfoCB.java similarity index 85% rename from src/main/java/org/codelibs/fess/es/config/cbean/bs/BsCrawlingSessionCB.java rename to src/main/java/org/codelibs/fess/es/config/cbean/bs/BsCrawlingInfoCB.java index 744f9fac4..85b7c5cd1 100644 --- a/src/main/java/org/codelibs/fess/es/config/cbean/bs/BsCrawlingSessionCB.java +++ b/src/main/java/org/codelibs/fess/es/config/cbean/bs/BsCrawlingInfoCB.java @@ -20,10 +20,10 @@ import java.util.List; import java.util.Map; import org.codelibs.fess.es.config.allcommon.EsAbstractConditionBean; -import org.codelibs.fess.es.config.bsentity.dbmeta.CrawlingSessionDbm; -import org.codelibs.fess.es.config.cbean.CrawlingSessionCB; -import org.codelibs.fess.es.config.cbean.cq.CrawlingSessionCQ; -import org.codelibs.fess.es.config.cbean.cq.bs.BsCrawlingSessionCQ; +import org.codelibs.fess.es.config.bsentity.dbmeta.CrawlingInfoDbm; +import org.codelibs.fess.es.config.cbean.CrawlingInfoCB; +import org.codelibs.fess.es.config.cbean.cq.CrawlingInfoCQ; +import org.codelibs.fess.es.config.cbean.cq.bs.BsCrawlingInfoCQ; import org.dbflute.cbean.ConditionQuery; import org.elasticsearch.action.count.CountRequestBuilder; import org.elasticsearch.action.search.SearchRequestBuilder; @@ -32,25 +32,25 @@ import org.elasticsearch.index.query.QueryBuilder; /** * @author ESFlute (using FreeGen) */ -public class BsCrawlingSessionCB extends EsAbstractConditionBean { +public class BsCrawlingInfoCB extends EsAbstractConditionBean { // =================================================================================== // Attribute // ========= - protected BsCrawlingSessionCQ _conditionQuery; + protected BsCrawlingInfoCQ _conditionQuery; protected HpSpecification _specification; // =================================================================================== // Control // ======= @Override - public CrawlingSessionDbm asDBMeta() { - return CrawlingSessionDbm.getInstance(); + public CrawlingInfoDbm asDBMeta() { + return CrawlingInfoDbm.getInstance(); } @Override public String asTableDbName() { - return "crawling_session"; + return "crawling_info"; } @Override @@ -66,16 +66,16 @@ public class BsCrawlingSessionCB extends EsAbstractConditionBean { // =================================================================================== // Primary Key // =========== - public CrawlingSessionCB acceptPK(String id) { + public CrawlingInfoCB acceptPK(String id) { assertObjectNotNull("id", id); - BsCrawlingSessionCB cb = this; + BsCrawlingInfoCB cb = this; cb.query().docMeta().setId_Equal(id); - return (CrawlingSessionCB) this; + return (CrawlingInfoCB) this; } @Override public void acceptPrimaryKeyMap(Map primaryKeyMap) { - acceptPK((String) primaryKeyMap.get("_id")); + acceptPK((String)primaryKeyMap.get("_id")); } // =================================================================================== @@ -114,20 +114,20 @@ public class BsCrawlingSessionCB extends EsAbstractConditionBean { // =================================================================================== // Query // ===== - public BsCrawlingSessionCQ query() { + public BsCrawlingInfoCQ query() { assertQueryPurpose(); return doGetConditionQuery(); } - protected BsCrawlingSessionCQ doGetConditionQuery() { + protected BsCrawlingInfoCQ doGetConditionQuery() { if (_conditionQuery == null) { _conditionQuery = createLocalCQ(); } return _conditionQuery; } - protected BsCrawlingSessionCQ createLocalCQ() { - return new CrawlingSessionCQ(); + protected BsCrawlingInfoCQ createLocalCQ() { + return new CrawlingInfoCQ(); } // =================================================================================== @@ -161,15 +161,12 @@ public class BsCrawlingSessionCB extends EsAbstractConditionBean { public void columnCreatedTime() { doColumn("createdTime"); } - public void columnExpiredTime() { doColumn("expiredTime"); } - public void columnName() { doColumn("name"); } - public void columnSessionId() { doColumn("sessionId"); } diff --git a/src/main/java/org/codelibs/fess/es/config/cbean/bs/BsCrawlingSessionInfoCB.java b/src/main/java/org/codelibs/fess/es/config/cbean/bs/BsCrawlingInfoParamCB.java similarity index 83% rename from src/main/java/org/codelibs/fess/es/config/cbean/bs/BsCrawlingSessionInfoCB.java rename to src/main/java/org/codelibs/fess/es/config/cbean/bs/BsCrawlingInfoParamCB.java index 6d0263914..15aef0bae 100644 --- a/src/main/java/org/codelibs/fess/es/config/cbean/bs/BsCrawlingSessionInfoCB.java +++ b/src/main/java/org/codelibs/fess/es/config/cbean/bs/BsCrawlingInfoParamCB.java @@ -20,10 +20,10 @@ import java.util.List; import java.util.Map; import org.codelibs.fess.es.config.allcommon.EsAbstractConditionBean; -import org.codelibs.fess.es.config.bsentity.dbmeta.CrawlingSessionInfoDbm; -import org.codelibs.fess.es.config.cbean.CrawlingSessionInfoCB; -import org.codelibs.fess.es.config.cbean.cq.CrawlingSessionInfoCQ; -import org.codelibs.fess.es.config.cbean.cq.bs.BsCrawlingSessionInfoCQ; +import org.codelibs.fess.es.config.bsentity.dbmeta.CrawlingInfoParamDbm; +import org.codelibs.fess.es.config.cbean.CrawlingInfoParamCB; +import org.codelibs.fess.es.config.cbean.cq.CrawlingInfoParamCQ; +import org.codelibs.fess.es.config.cbean.cq.bs.BsCrawlingInfoParamCQ; import org.dbflute.cbean.ConditionQuery; import org.elasticsearch.action.count.CountRequestBuilder; import org.elasticsearch.action.search.SearchRequestBuilder; @@ -32,25 +32,25 @@ import org.elasticsearch.index.query.QueryBuilder; /** * @author ESFlute (using FreeGen) */ -public class BsCrawlingSessionInfoCB extends EsAbstractConditionBean { +public class BsCrawlingInfoParamCB extends EsAbstractConditionBean { // =================================================================================== // Attribute // ========= - protected BsCrawlingSessionInfoCQ _conditionQuery; + protected BsCrawlingInfoParamCQ _conditionQuery; protected HpSpecification _specification; // =================================================================================== // Control // ======= @Override - public CrawlingSessionInfoDbm asDBMeta() { - return CrawlingSessionInfoDbm.getInstance(); + public CrawlingInfoParamDbm asDBMeta() { + return CrawlingInfoParamDbm.getInstance(); } @Override public String asTableDbName() { - return "crawling_session_info"; + return "crawling_info_param"; } @Override @@ -66,16 +66,16 @@ public class BsCrawlingSessionInfoCB extends EsAbstractConditionBean { // =================================================================================== // Primary Key // =========== - public CrawlingSessionInfoCB acceptPK(String id) { + public CrawlingInfoParamCB acceptPK(String id) { assertObjectNotNull("id", id); - BsCrawlingSessionInfoCB cb = this; + BsCrawlingInfoParamCB cb = this; cb.query().docMeta().setId_Equal(id); - return (CrawlingSessionInfoCB) this; + return (CrawlingInfoParamCB) this; } @Override public void acceptPrimaryKeyMap(Map primaryKeyMap) { - acceptPK((String) primaryKeyMap.get("_id")); + acceptPK((String)primaryKeyMap.get("_id")); } // =================================================================================== @@ -114,20 +114,20 @@ public class BsCrawlingSessionInfoCB extends EsAbstractConditionBean { // =================================================================================== // Query // ===== - public BsCrawlingSessionInfoCQ query() { + public BsCrawlingInfoParamCQ query() { assertQueryPurpose(); return doGetConditionQuery(); } - protected BsCrawlingSessionInfoCQ doGetConditionQuery() { + protected BsCrawlingInfoParamCQ doGetConditionQuery() { if (_conditionQuery == null) { _conditionQuery = createLocalCQ(); } return _conditionQuery; } - protected BsCrawlingSessionInfoCQ createLocalCQ() { - return new CrawlingSessionInfoCQ(); + protected BsCrawlingInfoParamCQ createLocalCQ() { + return new CrawlingInfoParamCQ(); } // =================================================================================== @@ -158,18 +158,15 @@ public class BsCrawlingSessionInfoCB extends EsAbstractConditionBean { doColumn("_id"); } - public void columnCrawlingSessionId() { - doColumn("crawlingSessionId"); + public void columnCrawlingInfoId() { + doColumn("crawlingInfoId"); } - public void columnCreatedTime() { doColumn("createdTime"); } - public void columnKey() { doColumn("key"); } - public void columnValue() { doColumn("value"); } diff --git a/src/main/java/org/codelibs/fess/es/config/cbean/bs/BsDataConfigCB.java b/src/main/java/org/codelibs/fess/es/config/cbean/bs/BsDataConfigCB.java index e1487f020..7f2da3190 100644 --- a/src/main/java/org/codelibs/fess/es/config/cbean/bs/BsDataConfigCB.java +++ b/src/main/java/org/codelibs/fess/es/config/cbean/bs/BsDataConfigCB.java @@ -75,7 +75,7 @@ public class BsDataConfigCB extends EsAbstractConditionBean { @Override public void acceptPrimaryKeyMap(Map primaryKeyMap) { - acceptPK((String) primaryKeyMap.get("_id")); + acceptPK((String)primaryKeyMap.get("_id")); } // =================================================================================== @@ -161,43 +161,33 @@ public class BsDataConfigCB extends EsAbstractConditionBean { public void columnAvailable() { doColumn("available"); } - public void columnBoost() { doColumn("boost"); } - public void columnCreatedBy() { doColumn("createdBy"); } - public void columnCreatedTime() { doColumn("createdTime"); } - public void columnHandlerName() { doColumn("handlerName"); } - public void columnHandlerParameter() { doColumn("handlerParameter"); } - public void columnHandlerScript() { doColumn("handlerScript"); } - public void columnName() { doColumn("name"); } - public void columnSortOrder() { doColumn("sortOrder"); } - public void columnUpdatedBy() { doColumn("updatedBy"); } - public void columnUpdatedTime() { doColumn("updatedTime"); } diff --git a/src/main/java/org/codelibs/fess/es/config/cbean/bs/BsDataConfigToLabelCB.java b/src/main/java/org/codelibs/fess/es/config/cbean/bs/BsDataConfigToLabelCB.java index b1c641d69..916c91f76 100644 --- a/src/main/java/org/codelibs/fess/es/config/cbean/bs/BsDataConfigToLabelCB.java +++ b/src/main/java/org/codelibs/fess/es/config/cbean/bs/BsDataConfigToLabelCB.java @@ -75,7 +75,7 @@ public class BsDataConfigToLabelCB extends EsAbstractConditionBean { @Override public void acceptPrimaryKeyMap(Map primaryKeyMap) { - acceptPK((String) primaryKeyMap.get("_id")); + acceptPK((String)primaryKeyMap.get("_id")); } // =================================================================================== @@ -161,7 +161,6 @@ public class BsDataConfigToLabelCB extends EsAbstractConditionBean { public void columnDataConfigId() { doColumn("dataConfigId"); } - public void columnLabelTypeId() { doColumn("labelTypeId"); } diff --git a/src/main/java/org/codelibs/fess/es/config/cbean/bs/BsDataConfigToRoleCB.java b/src/main/java/org/codelibs/fess/es/config/cbean/bs/BsDataConfigToRoleCB.java index 0207e5156..a2e612b21 100644 --- a/src/main/java/org/codelibs/fess/es/config/cbean/bs/BsDataConfigToRoleCB.java +++ b/src/main/java/org/codelibs/fess/es/config/cbean/bs/BsDataConfigToRoleCB.java @@ -75,7 +75,7 @@ public class BsDataConfigToRoleCB extends EsAbstractConditionBean { @Override public void acceptPrimaryKeyMap(Map primaryKeyMap) { - acceptPK((String) primaryKeyMap.get("_id")); + acceptPK((String)primaryKeyMap.get("_id")); } // =================================================================================== @@ -161,7 +161,6 @@ public class BsDataConfigToRoleCB extends EsAbstractConditionBean { public void columnDataConfigId() { doColumn("dataConfigId"); } - public void columnRoleTypeId() { doColumn("roleTypeId"); } diff --git a/src/main/java/org/codelibs/fess/es/config/cbean/bs/BsDuplicateHostCB.java b/src/main/java/org/codelibs/fess/es/config/cbean/bs/BsDuplicateHostCB.java index 36876e491..d2c27f3a7 100644 --- a/src/main/java/org/codelibs/fess/es/config/cbean/bs/BsDuplicateHostCB.java +++ b/src/main/java/org/codelibs/fess/es/config/cbean/bs/BsDuplicateHostCB.java @@ -75,7 +75,7 @@ public class BsDuplicateHostCB extends EsAbstractConditionBean { @Override public void acceptPrimaryKeyMap(Map primaryKeyMap) { - acceptPK((String) primaryKeyMap.get("_id")); + acceptPK((String)primaryKeyMap.get("_id")); } // =================================================================================== @@ -161,27 +161,21 @@ public class BsDuplicateHostCB extends EsAbstractConditionBean { public void columnCreatedBy() { doColumn("createdBy"); } - public void columnCreatedTime() { doColumn("createdTime"); } - public void columnDuplicateHostName() { doColumn("duplicateHostName"); } - public void columnRegularName() { doColumn("regularName"); } - public void columnSortOrder() { doColumn("sortOrder"); } - public void columnUpdatedBy() { doColumn("updatedBy"); } - public void columnUpdatedTime() { doColumn("updatedTime"); } diff --git a/src/main/java/org/codelibs/fess/es/config/cbean/bs/BsFailureUrlCB.java b/src/main/java/org/codelibs/fess/es/config/cbean/bs/BsFailureUrlCB.java index e5d8baa00..ce2435221 100644 --- a/src/main/java/org/codelibs/fess/es/config/cbean/bs/BsFailureUrlCB.java +++ b/src/main/java/org/codelibs/fess/es/config/cbean/bs/BsFailureUrlCB.java @@ -75,7 +75,7 @@ public class BsFailureUrlCB extends EsAbstractConditionBean { @Override public void acceptPrimaryKeyMap(Map primaryKeyMap) { - acceptPK((String) primaryKeyMap.get("_id")); + acceptPK((String)primaryKeyMap.get("_id")); } // =================================================================================== @@ -161,27 +161,21 @@ public class BsFailureUrlCB extends EsAbstractConditionBean { public void columnConfigId() { doColumn("configId"); } - public void columnErrorCount() { doColumn("errorCount"); } - public void columnErrorLog() { doColumn("errorLog"); } - public void columnErrorName() { doColumn("errorName"); } - public void columnLastAccessTime() { doColumn("lastAccessTime"); } - public void columnThreadName() { doColumn("threadName"); } - public void columnUrl() { doColumn("url"); } diff --git a/src/main/java/org/codelibs/fess/es/config/cbean/bs/BsFileAuthenticationCB.java b/src/main/java/org/codelibs/fess/es/config/cbean/bs/BsFileAuthenticationCB.java index 0cb3ea71d..6f43642ac 100644 --- a/src/main/java/org/codelibs/fess/es/config/cbean/bs/BsFileAuthenticationCB.java +++ b/src/main/java/org/codelibs/fess/es/config/cbean/bs/BsFileAuthenticationCB.java @@ -75,7 +75,7 @@ public class BsFileAuthenticationCB extends EsAbstractConditionBean { @Override public void acceptPrimaryKeyMap(Map primaryKeyMap) { - acceptPK((String) primaryKeyMap.get("_id")); + acceptPK((String)primaryKeyMap.get("_id")); } // =================================================================================== @@ -161,43 +161,33 @@ public class BsFileAuthenticationCB extends EsAbstractConditionBean { public void columnCreatedBy() { doColumn("createdBy"); } - public void columnCreatedTime() { doColumn("createdTime"); } - public void columnFileConfigId() { doColumn("fileConfigId"); } - public void columnHostname() { doColumn("hostname"); } - public void columnParameters() { doColumn("parameters"); } - public void columnPassword() { doColumn("password"); } - public void columnPort() { doColumn("port"); } - public void columnProtocolScheme() { doColumn("protocolScheme"); } - public void columnUpdatedBy() { doColumn("updatedBy"); } - public void columnUpdatedTime() { doColumn("updatedTime"); } - public void columnUsername() { doColumn("username"); } diff --git a/src/main/java/org/codelibs/fess/es/config/cbean/bs/BsFileConfigCB.java b/src/main/java/org/codelibs/fess/es/config/cbean/bs/BsFileConfigCB.java index 1022fc497..8b94e5d0d 100644 --- a/src/main/java/org/codelibs/fess/es/config/cbean/bs/BsFileConfigCB.java +++ b/src/main/java/org/codelibs/fess/es/config/cbean/bs/BsFileConfigCB.java @@ -75,7 +75,7 @@ public class BsFileConfigCB extends EsAbstractConditionBean { @Override public void acceptPrimaryKeyMap(Map primaryKeyMap) { - acceptPK((String) primaryKeyMap.get("_id")); + acceptPK((String)primaryKeyMap.get("_id")); } // =================================================================================== @@ -161,75 +161,57 @@ public class BsFileConfigCB extends EsAbstractConditionBean { public void columnAvailable() { doColumn("available"); } - public void columnBoost() { doColumn("boost"); } - public void columnConfigParameter() { doColumn("configParameter"); } - public void columnCreatedBy() { doColumn("createdBy"); } - public void columnCreatedTime() { doColumn("createdTime"); } - public void columnDepth() { doColumn("depth"); } - public void columnExcludedDocPaths() { doColumn("excludedDocPaths"); } - public void columnExcludedPaths() { doColumn("excludedPaths"); } - public void columnIncludedDocPaths() { doColumn("includedDocPaths"); } - public void columnIncludedPaths() { doColumn("includedPaths"); } - public void columnIntervalTime() { doColumn("intervalTime"); } - public void columnTimeToLive() { doColumn("timeToLive"); } - public void columnMaxAccessCount() { doColumn("maxAccessCount"); } - public void columnName() { doColumn("name"); } - public void columnNumOfThread() { doColumn("numOfThread"); } - public void columnPaths() { doColumn("paths"); } - public void columnSortOrder() { doColumn("sortOrder"); } - public void columnUpdatedBy() { doColumn("updatedBy"); } - public void columnUpdatedTime() { doColumn("updatedTime"); } diff --git a/src/main/java/org/codelibs/fess/es/config/cbean/bs/BsFileConfigToLabelCB.java b/src/main/java/org/codelibs/fess/es/config/cbean/bs/BsFileConfigToLabelCB.java index 4c3458e20..bfffcc7fd 100644 --- a/src/main/java/org/codelibs/fess/es/config/cbean/bs/BsFileConfigToLabelCB.java +++ b/src/main/java/org/codelibs/fess/es/config/cbean/bs/BsFileConfigToLabelCB.java @@ -75,7 +75,7 @@ public class BsFileConfigToLabelCB extends EsAbstractConditionBean { @Override public void acceptPrimaryKeyMap(Map primaryKeyMap) { - acceptPK((String) primaryKeyMap.get("_id")); + acceptPK((String)primaryKeyMap.get("_id")); } // =================================================================================== @@ -161,7 +161,6 @@ public class BsFileConfigToLabelCB extends EsAbstractConditionBean { public void columnFileConfigId() { doColumn("fileConfigId"); } - public void columnLabelTypeId() { doColumn("labelTypeId"); } diff --git a/src/main/java/org/codelibs/fess/es/config/cbean/bs/BsFileConfigToRoleCB.java b/src/main/java/org/codelibs/fess/es/config/cbean/bs/BsFileConfigToRoleCB.java index 58aaf217f..5769f9e64 100644 --- a/src/main/java/org/codelibs/fess/es/config/cbean/bs/BsFileConfigToRoleCB.java +++ b/src/main/java/org/codelibs/fess/es/config/cbean/bs/BsFileConfigToRoleCB.java @@ -75,7 +75,7 @@ public class BsFileConfigToRoleCB extends EsAbstractConditionBean { @Override public void acceptPrimaryKeyMap(Map primaryKeyMap) { - acceptPK((String) primaryKeyMap.get("_id")); + acceptPK((String)primaryKeyMap.get("_id")); } // =================================================================================== @@ -161,7 +161,6 @@ public class BsFileConfigToRoleCB extends EsAbstractConditionBean { public void columnFileConfigId() { doColumn("fileConfigId"); } - public void columnRoleTypeId() { doColumn("roleTypeId"); } diff --git a/src/main/java/org/codelibs/fess/es/config/cbean/bs/BsJobLogCB.java b/src/main/java/org/codelibs/fess/es/config/cbean/bs/BsJobLogCB.java index 3f986a100..79bea7396 100644 --- a/src/main/java/org/codelibs/fess/es/config/cbean/bs/BsJobLogCB.java +++ b/src/main/java/org/codelibs/fess/es/config/cbean/bs/BsJobLogCB.java @@ -75,7 +75,7 @@ public class BsJobLogCB extends EsAbstractConditionBean { @Override public void acceptPrimaryKeyMap(Map primaryKeyMap) { - acceptPK((String) primaryKeyMap.get("_id")); + acceptPK((String)primaryKeyMap.get("_id")); } // =================================================================================== @@ -161,31 +161,24 @@ public class BsJobLogCB extends EsAbstractConditionBean { public void columnEndTime() { doColumn("endTime"); } - public void columnJobName() { doColumn("jobName"); } - public void columnJobStatus() { doColumn("jobStatus"); } - public void columnScriptData() { doColumn("scriptData"); } - public void columnScriptResult() { doColumn("scriptResult"); } - public void columnScriptType() { doColumn("scriptType"); } - public void columnStartTime() { doColumn("startTime"); } - public void columnTarget() { doColumn("target"); } diff --git a/src/main/java/org/codelibs/fess/es/config/cbean/bs/BsKeyMatchCB.java b/src/main/java/org/codelibs/fess/es/config/cbean/bs/BsKeyMatchCB.java index d0e1d54fe..1ae639cba 100644 --- a/src/main/java/org/codelibs/fess/es/config/cbean/bs/BsKeyMatchCB.java +++ b/src/main/java/org/codelibs/fess/es/config/cbean/bs/BsKeyMatchCB.java @@ -75,7 +75,7 @@ public class BsKeyMatchCB extends EsAbstractConditionBean { @Override public void acceptPrimaryKeyMap(Map primaryKeyMap) { - acceptPK((String) primaryKeyMap.get("_id")); + acceptPK((String)primaryKeyMap.get("_id")); } // =================================================================================== @@ -161,31 +161,24 @@ public class BsKeyMatchCB extends EsAbstractConditionBean { public void columnBoost() { doColumn("boost"); } - public void columnCreatedBy() { doColumn("createdBy"); } - public void columnCreatedTime() { doColumn("createdTime"); } - public void columnMaxSize() { doColumn("maxSize"); } - public void columnQuery() { doColumn("query"); } - public void columnTerm() { doColumn("term"); } - public void columnUpdatedBy() { doColumn("updatedBy"); } - public void columnUpdatedTime() { doColumn("updatedTime"); } diff --git a/src/main/java/org/codelibs/fess/es/config/cbean/bs/BsLabelToRoleCB.java b/src/main/java/org/codelibs/fess/es/config/cbean/bs/BsLabelToRoleCB.java index a606d5fa6..aada60917 100644 --- a/src/main/java/org/codelibs/fess/es/config/cbean/bs/BsLabelToRoleCB.java +++ b/src/main/java/org/codelibs/fess/es/config/cbean/bs/BsLabelToRoleCB.java @@ -75,7 +75,7 @@ public class BsLabelToRoleCB extends EsAbstractConditionBean { @Override public void acceptPrimaryKeyMap(Map primaryKeyMap) { - acceptPK((String) primaryKeyMap.get("_id")); + acceptPK((String)primaryKeyMap.get("_id")); } // =================================================================================== @@ -161,7 +161,6 @@ public class BsLabelToRoleCB extends EsAbstractConditionBean { public void columnLabelTypeId() { doColumn("labelTypeId"); } - public void columnRoleTypeId() { doColumn("roleTypeId"); } diff --git a/src/main/java/org/codelibs/fess/es/config/cbean/bs/BsLabelTypeCB.java b/src/main/java/org/codelibs/fess/es/config/cbean/bs/BsLabelTypeCB.java index c7283c576..b91c0bdf4 100644 --- a/src/main/java/org/codelibs/fess/es/config/cbean/bs/BsLabelTypeCB.java +++ b/src/main/java/org/codelibs/fess/es/config/cbean/bs/BsLabelTypeCB.java @@ -75,7 +75,7 @@ public class BsLabelTypeCB extends EsAbstractConditionBean { @Override public void acceptPrimaryKeyMap(Map primaryKeyMap) { - acceptPK((String) primaryKeyMap.get("_id")); + acceptPK((String)primaryKeyMap.get("_id")); } // =================================================================================== @@ -161,35 +161,27 @@ public class BsLabelTypeCB extends EsAbstractConditionBean { public void columnCreatedBy() { doColumn("createdBy"); } - public void columnCreatedTime() { doColumn("createdTime"); } - public void columnExcludedPaths() { doColumn("excludedPaths"); } - public void columnIncludedPaths() { doColumn("includedPaths"); } - public void columnName() { doColumn("name"); } - public void columnSortOrder() { doColumn("sortOrder"); } - public void columnUpdatedBy() { doColumn("updatedBy"); } - public void columnUpdatedTime() { doColumn("updatedTime"); } - public void columnValue() { doColumn("value"); } diff --git a/src/main/java/org/codelibs/fess/es/config/cbean/bs/BsPathMappingCB.java b/src/main/java/org/codelibs/fess/es/config/cbean/bs/BsPathMappingCB.java index 1ab5c924c..967931e71 100644 --- a/src/main/java/org/codelibs/fess/es/config/cbean/bs/BsPathMappingCB.java +++ b/src/main/java/org/codelibs/fess/es/config/cbean/bs/BsPathMappingCB.java @@ -75,7 +75,7 @@ public class BsPathMappingCB extends EsAbstractConditionBean { @Override public void acceptPrimaryKeyMap(Map primaryKeyMap) { - acceptPK((String) primaryKeyMap.get("_id")); + acceptPK((String)primaryKeyMap.get("_id")); } // =================================================================================== @@ -161,31 +161,24 @@ public class BsPathMappingCB extends EsAbstractConditionBean { public void columnCreatedBy() { doColumn("createdBy"); } - public void columnCreatedTime() { doColumn("createdTime"); } - public void columnProcessType() { doColumn("processType"); } - public void columnRegex() { doColumn("regex"); } - public void columnReplacement() { doColumn("replacement"); } - public void columnSortOrder() { doColumn("sortOrder"); } - public void columnUpdatedBy() { doColumn("updatedBy"); } - public void columnUpdatedTime() { doColumn("updatedTime"); } diff --git a/src/main/java/org/codelibs/fess/es/config/cbean/bs/BsRequestHeaderCB.java b/src/main/java/org/codelibs/fess/es/config/cbean/bs/BsRequestHeaderCB.java index 6937b041b..082e874a1 100644 --- a/src/main/java/org/codelibs/fess/es/config/cbean/bs/BsRequestHeaderCB.java +++ b/src/main/java/org/codelibs/fess/es/config/cbean/bs/BsRequestHeaderCB.java @@ -75,7 +75,7 @@ public class BsRequestHeaderCB extends EsAbstractConditionBean { @Override public void acceptPrimaryKeyMap(Map primaryKeyMap) { - acceptPK((String) primaryKeyMap.get("_id")); + acceptPK((String)primaryKeyMap.get("_id")); } // =================================================================================== @@ -161,27 +161,21 @@ public class BsRequestHeaderCB extends EsAbstractConditionBean { public void columnCreatedBy() { doColumn("createdBy"); } - public void columnCreatedTime() { doColumn("createdTime"); } - public void columnName() { doColumn("name"); } - public void columnUpdatedBy() { doColumn("updatedBy"); } - public void columnUpdatedTime() { doColumn("updatedTime"); } - public void columnValue() { doColumn("value"); } - public void columnWebConfigId() { doColumn("webConfigId"); } diff --git a/src/main/java/org/codelibs/fess/es/config/cbean/bs/BsRoleTypeCB.java b/src/main/java/org/codelibs/fess/es/config/cbean/bs/BsRoleTypeCB.java index 9b8904c7c..edd399629 100644 --- a/src/main/java/org/codelibs/fess/es/config/cbean/bs/BsRoleTypeCB.java +++ b/src/main/java/org/codelibs/fess/es/config/cbean/bs/BsRoleTypeCB.java @@ -75,7 +75,7 @@ public class BsRoleTypeCB extends EsAbstractConditionBean { @Override public void acceptPrimaryKeyMap(Map primaryKeyMap) { - acceptPK((String) primaryKeyMap.get("_id")); + acceptPK((String)primaryKeyMap.get("_id")); } // =================================================================================== @@ -161,27 +161,21 @@ public class BsRoleTypeCB extends EsAbstractConditionBean { public void columnCreatedBy() { doColumn("createdBy"); } - public void columnCreatedTime() { doColumn("createdTime"); } - public void columnName() { doColumn("name"); } - public void columnSortOrder() { doColumn("sortOrder"); } - public void columnUpdatedBy() { doColumn("updatedBy"); } - public void columnUpdatedTime() { doColumn("updatedTime"); } - public void columnValue() { doColumn("value"); } diff --git a/src/main/java/org/codelibs/fess/es/config/cbean/bs/BsScheduledJobCB.java b/src/main/java/org/codelibs/fess/es/config/cbean/bs/BsScheduledJobCB.java index e303bc9f2..0deed9290 100644 --- a/src/main/java/org/codelibs/fess/es/config/cbean/bs/BsScheduledJobCB.java +++ b/src/main/java/org/codelibs/fess/es/config/cbean/bs/BsScheduledJobCB.java @@ -75,7 +75,7 @@ public class BsScheduledJobCB extends EsAbstractConditionBean { @Override public void acceptPrimaryKeyMap(Map primaryKeyMap) { - acceptPK((String) primaryKeyMap.get("_id")); + acceptPK((String)primaryKeyMap.get("_id")); } // =================================================================================== @@ -161,51 +161,39 @@ public class BsScheduledJobCB extends EsAbstractConditionBean { public void columnAvailable() { doColumn("available"); } - public void columnCrawler() { doColumn("crawler"); } - public void columnCreatedBy() { doColumn("createdBy"); } - public void columnCreatedTime() { doColumn("createdTime"); } - public void columnCronExpression() { doColumn("cronExpression"); } - public void columnJobLogging() { doColumn("jobLogging"); } - public void columnName() { doColumn("name"); } - public void columnScriptData() { doColumn("scriptData"); } - public void columnScriptType() { doColumn("scriptType"); } - public void columnSortOrder() { doColumn("sortOrder"); } - public void columnTarget() { doColumn("target"); } - public void columnUpdatedBy() { doColumn("updatedBy"); } - public void columnUpdatedTime() { doColumn("updatedTime"); } diff --git a/src/main/java/org/codelibs/fess/es/config/cbean/bs/BsSuggestBadWordCB.java b/src/main/java/org/codelibs/fess/es/config/cbean/bs/BsSuggestBadWordCB.java index 761350905..d65ad50b7 100644 --- a/src/main/java/org/codelibs/fess/es/config/cbean/bs/BsSuggestBadWordCB.java +++ b/src/main/java/org/codelibs/fess/es/config/cbean/bs/BsSuggestBadWordCB.java @@ -75,7 +75,7 @@ public class BsSuggestBadWordCB extends EsAbstractConditionBean { @Override public void acceptPrimaryKeyMap(Map primaryKeyMap) { - acceptPK((String) primaryKeyMap.get("_id")); + acceptPK((String)primaryKeyMap.get("_id")); } // =================================================================================== @@ -161,27 +161,21 @@ public class BsSuggestBadWordCB extends EsAbstractConditionBean { public void columnCreatedBy() { doColumn("createdBy"); } - public void columnCreatedTime() { doColumn("createdTime"); } - public void columnSuggestWord() { doColumn("suggestWord"); } - public void columnTargetLabel() { doColumn("targetLabel"); } - public void columnTargetRole() { doColumn("targetRole"); } - public void columnUpdatedBy() { doColumn("updatedBy"); } - public void columnUpdatedTime() { doColumn("updatedTime"); } diff --git a/src/main/java/org/codelibs/fess/es/config/cbean/bs/BsSuggestElevateWordCB.java b/src/main/java/org/codelibs/fess/es/config/cbean/bs/BsSuggestElevateWordCB.java index 346246df2..1cd32b0b9 100644 --- a/src/main/java/org/codelibs/fess/es/config/cbean/bs/BsSuggestElevateWordCB.java +++ b/src/main/java/org/codelibs/fess/es/config/cbean/bs/BsSuggestElevateWordCB.java @@ -75,7 +75,7 @@ public class BsSuggestElevateWordCB extends EsAbstractConditionBean { @Override public void acceptPrimaryKeyMap(Map primaryKeyMap) { - acceptPK((String) primaryKeyMap.get("_id")); + acceptPK((String)primaryKeyMap.get("_id")); } // =================================================================================== @@ -161,35 +161,27 @@ public class BsSuggestElevateWordCB extends EsAbstractConditionBean { public void columnBoost() { doColumn("boost"); } - public void columnCreatedBy() { doColumn("createdBy"); } - public void columnCreatedTime() { doColumn("createdTime"); } - public void columnReading() { doColumn("reading"); } - public void columnSuggestWord() { doColumn("suggestWord"); } - public void columnTargetLabel() { doColumn("targetLabel"); } - public void columnTargetRole() { doColumn("targetRole"); } - public void columnUpdatedBy() { doColumn("updatedBy"); } - public void columnUpdatedTime() { doColumn("updatedTime"); } diff --git a/src/main/java/org/codelibs/fess/es/config/cbean/bs/BsSuggestElevateWordToLabelCB.java b/src/main/java/org/codelibs/fess/es/config/cbean/bs/BsSuggestElevateWordToLabelCB.java index 925331819..fb5ffd752 100644 --- a/src/main/java/org/codelibs/fess/es/config/cbean/bs/BsSuggestElevateWordToLabelCB.java +++ b/src/main/java/org/codelibs/fess/es/config/cbean/bs/BsSuggestElevateWordToLabelCB.java @@ -75,7 +75,7 @@ public class BsSuggestElevateWordToLabelCB extends EsAbstractConditionBean { @Override public void acceptPrimaryKeyMap(Map primaryKeyMap) { - acceptPK((String) primaryKeyMap.get("_id")); + acceptPK((String)primaryKeyMap.get("_id")); } // =================================================================================== @@ -161,7 +161,6 @@ public class BsSuggestElevateWordToLabelCB extends EsAbstractConditionBean { public void columnSuggestElevateWordId() { doColumn("suggestElevateWordId"); } - public void columnLabelTypeId() { doColumn("labelTypeId"); } diff --git a/src/main/java/org/codelibs/fess/es/config/cbean/bs/BsWebAuthenticationCB.java b/src/main/java/org/codelibs/fess/es/config/cbean/bs/BsWebAuthenticationCB.java index 1e43b69cb..3ec8eb8e4 100644 --- a/src/main/java/org/codelibs/fess/es/config/cbean/bs/BsWebAuthenticationCB.java +++ b/src/main/java/org/codelibs/fess/es/config/cbean/bs/BsWebAuthenticationCB.java @@ -75,7 +75,7 @@ public class BsWebAuthenticationCB extends EsAbstractConditionBean { @Override public void acceptPrimaryKeyMap(Map primaryKeyMap) { - acceptPK((String) primaryKeyMap.get("_id")); + acceptPK((String)primaryKeyMap.get("_id")); } // =================================================================================== @@ -161,47 +161,36 @@ public class BsWebAuthenticationCB extends EsAbstractConditionBean { public void columnAuthRealm() { doColumn("authRealm"); } - public void columnCreatedBy() { doColumn("createdBy"); } - public void columnCreatedTime() { doColumn("createdTime"); } - public void columnHostname() { doColumn("hostname"); } - public void columnParameters() { doColumn("parameters"); } - public void columnPassword() { doColumn("password"); } - public void columnPort() { doColumn("port"); } - public void columnProtocolScheme() { doColumn("protocolScheme"); } - public void columnUpdatedBy() { doColumn("updatedBy"); } - public void columnUpdatedTime() { doColumn("updatedTime"); } - public void columnUsername() { doColumn("username"); } - public void columnWebConfigId() { doColumn("webConfigId"); } diff --git a/src/main/java/org/codelibs/fess/es/config/cbean/bs/BsWebConfigCB.java b/src/main/java/org/codelibs/fess/es/config/cbean/bs/BsWebConfigCB.java index 93c7faa83..6a4097680 100644 --- a/src/main/java/org/codelibs/fess/es/config/cbean/bs/BsWebConfigCB.java +++ b/src/main/java/org/codelibs/fess/es/config/cbean/bs/BsWebConfigCB.java @@ -75,7 +75,7 @@ public class BsWebConfigCB extends EsAbstractConditionBean { @Override public void acceptPrimaryKeyMap(Map primaryKeyMap) { - acceptPK((String) primaryKeyMap.get("_id")); + acceptPK((String)primaryKeyMap.get("_id")); } // =================================================================================== @@ -161,79 +161,60 @@ public class BsWebConfigCB extends EsAbstractConditionBean { public void columnAvailable() { doColumn("available"); } - public void columnBoost() { doColumn("boost"); } - public void columnConfigParameter() { doColumn("configParameter"); } - public void columnCreatedBy() { doColumn("createdBy"); } - public void columnCreatedTime() { doColumn("createdTime"); } - public void columnDepth() { doColumn("depth"); } - public void columnExcludedDocUrls() { doColumn("excludedDocUrls"); } - public void columnExcludedUrls() { doColumn("excludedUrls"); } - public void columnIncludedDocUrls() { doColumn("includedDocUrls"); } - public void columnIncludedUrls() { doColumn("includedUrls"); } - public void columnIntervalTime() { doColumn("intervalTime"); } - public void columnTimeToLive() { doColumn("timeToLive"); } - public void columnMaxAccessCount() { doColumn("maxAccessCount"); } - public void columnName() { doColumn("name"); } - public void columnNumOfThread() { doColumn("numOfThread"); } - public void columnSortOrder() { doColumn("sortOrder"); } - public void columnUpdatedBy() { doColumn("updatedBy"); } - public void columnUpdatedTime() { doColumn("updatedTime"); } - public void columnUrls() { doColumn("urls"); } - public void columnUserAgent() { doColumn("userAgent"); } diff --git a/src/main/java/org/codelibs/fess/es/config/cbean/bs/BsWebConfigToLabelCB.java b/src/main/java/org/codelibs/fess/es/config/cbean/bs/BsWebConfigToLabelCB.java index 5c6d89281..10c381fa0 100644 --- a/src/main/java/org/codelibs/fess/es/config/cbean/bs/BsWebConfigToLabelCB.java +++ b/src/main/java/org/codelibs/fess/es/config/cbean/bs/BsWebConfigToLabelCB.java @@ -75,7 +75,7 @@ public class BsWebConfigToLabelCB extends EsAbstractConditionBean { @Override public void acceptPrimaryKeyMap(Map primaryKeyMap) { - acceptPK((String) primaryKeyMap.get("_id")); + acceptPK((String)primaryKeyMap.get("_id")); } // =================================================================================== @@ -161,7 +161,6 @@ public class BsWebConfigToLabelCB extends EsAbstractConditionBean { public void columnLabelTypeId() { doColumn("labelTypeId"); } - public void columnWebConfigId() { doColumn("webConfigId"); } diff --git a/src/main/java/org/codelibs/fess/es/config/cbean/bs/BsWebConfigToRoleCB.java b/src/main/java/org/codelibs/fess/es/config/cbean/bs/BsWebConfigToRoleCB.java index 2b3f5e9b6..2c3f5a286 100644 --- a/src/main/java/org/codelibs/fess/es/config/cbean/bs/BsWebConfigToRoleCB.java +++ b/src/main/java/org/codelibs/fess/es/config/cbean/bs/BsWebConfigToRoleCB.java @@ -75,7 +75,7 @@ public class BsWebConfigToRoleCB extends EsAbstractConditionBean { @Override public void acceptPrimaryKeyMap(Map primaryKeyMap) { - acceptPK((String) primaryKeyMap.get("_id")); + acceptPK((String)primaryKeyMap.get("_id")); } // =================================================================================== @@ -161,7 +161,6 @@ public class BsWebConfigToRoleCB extends EsAbstractConditionBean { public void columnRoleTypeId() { doColumn("roleTypeId"); } - public void columnWebConfigId() { doColumn("webConfigId"); } diff --git a/src/main/java/org/codelibs/fess/es/config/cbean/cq/CrawlingSessionCQ.java b/src/main/java/org/codelibs/fess/es/config/cbean/cq/CrawlingInfoCQ.java similarity index 84% rename from src/main/java/org/codelibs/fess/es/config/cbean/cq/CrawlingSessionCQ.java rename to src/main/java/org/codelibs/fess/es/config/cbean/cq/CrawlingInfoCQ.java index f36cce907..088c45d4d 100644 --- a/src/main/java/org/codelibs/fess/es/config/cbean/cq/CrawlingSessionCQ.java +++ b/src/main/java/org/codelibs/fess/es/config/cbean/cq/CrawlingInfoCQ.java @@ -15,10 +15,10 @@ */ package org.codelibs.fess.es.config.cbean.cq; -import org.codelibs.fess.es.config.cbean.cq.bs.BsCrawlingSessionCQ; +import org.codelibs.fess.es.config.cbean.cq.bs.BsCrawlingInfoCQ; /** * @author ESFlute (using FreeGen) */ -public class CrawlingSessionCQ extends BsCrawlingSessionCQ { +public class CrawlingInfoCQ extends BsCrawlingInfoCQ { } diff --git a/src/main/java/org/codelibs/fess/es/config/cbean/cq/CrawlingSessionInfoCQ.java b/src/main/java/org/codelibs/fess/es/config/cbean/cq/CrawlingInfoParamCQ.java similarity index 83% rename from src/main/java/org/codelibs/fess/es/config/cbean/cq/CrawlingSessionInfoCQ.java rename to src/main/java/org/codelibs/fess/es/config/cbean/cq/CrawlingInfoParamCQ.java index 49f5c711f..4e7c184d0 100644 --- a/src/main/java/org/codelibs/fess/es/config/cbean/cq/CrawlingSessionInfoCQ.java +++ b/src/main/java/org/codelibs/fess/es/config/cbean/cq/CrawlingInfoParamCQ.java @@ -15,10 +15,10 @@ */ package org.codelibs.fess.es.config.cbean.cq; -import org.codelibs.fess.es.config.cbean.cq.bs.BsCrawlingSessionInfoCQ; +import org.codelibs.fess.es.config.cbean.cq.bs.BsCrawlingInfoParamCQ; /** * @author ESFlute (using FreeGen) */ -public class CrawlingSessionInfoCQ extends BsCrawlingSessionInfoCQ { +public class CrawlingInfoParamCQ extends BsCrawlingInfoParamCQ { } diff --git a/src/main/java/org/codelibs/fess/es/config/cbean/cq/bs/BsBoostDocumentRuleCQ.java b/src/main/java/org/codelibs/fess/es/config/cbean/cq/bs/BsBoostDocumentRuleCQ.java index 8779f61b6..b377f6734 100644 --- a/src/main/java/org/codelibs/fess/es/config/cbean/cq/bs/BsBoostDocumentRuleCQ.java +++ b/src/main/java/org/codelibs/fess/es/config/cbean/cq/bs/BsBoostDocumentRuleCQ.java @@ -15,7 +15,7 @@ */ package org.codelibs.fess.es.config.cbean.cq.bs; -import java.time.LocalDateTime; +import java.time.*; import java.util.Collection; import org.codelibs.fess.es.config.allcommon.EsAbstractConditionQuery; @@ -33,6 +33,7 @@ import org.elasticsearch.index.query.RangeQueryBuilder; import org.elasticsearch.index.query.TermQueryBuilder; import org.elasticsearch.index.query.TermsQueryBuilder; + /** * @author ESFlute (using FreeGen) */ @@ -62,7 +63,7 @@ public abstract class BsBoostDocumentRuleCQ extends EsAbstractConditionQuery { public void filtered(FilteredCall filteredLambda, ConditionOptionCall opLambda) { - bool((must, should, mustNot, filter) -> { + bool((must, should, mustNot, filter)->{ filteredLambda.callback(must, filter); }, opLambda); } @@ -97,9 +98,7 @@ public abstract class BsBoostDocumentRuleCQ extends EsAbstractConditionQuery { BoostDocumentRuleCQ filterQuery = new BoostDocumentRuleCQ(); boolLambda.callback(mustQuery, shouldQuery, mustNotQuery, filterQuery); if (mustQuery.hasQueries() || shouldQuery.hasQueries() || mustNotQuery.hasQueries() || filterQuery.hasQueries()) { - BoolQueryBuilder builder = - regBoolCQ(mustQuery.getQueryBuilderList(), shouldQuery.getQueryBuilderList(), mustNotQuery.getQueryBuilderList(), - filterQuery.getQueryBuilderList()); + BoolQueryBuilder builder = regBoolCQ(mustQuery.getQueryBuilderList(), shouldQuery.getQueryBuilderList(), mustNotQuery.getQueryBuilderList(), filterQuery.getQueryBuilderList()); if (opLambda != null) { opLambda.callback(builder); } diff --git a/src/main/java/org/codelibs/fess/es/config/cbean/cq/bs/BsCrawlingSessionCQ.java b/src/main/java/org/codelibs/fess/es/config/cbean/cq/bs/BsCrawlingInfoCQ.java similarity index 93% rename from src/main/java/org/codelibs/fess/es/config/cbean/cq/bs/BsCrawlingSessionCQ.java rename to src/main/java/org/codelibs/fess/es/config/cbean/cq/bs/BsCrawlingInfoCQ.java index 387eaed3d..da88a1a38 100644 --- a/src/main/java/org/codelibs/fess/es/config/cbean/cq/bs/BsCrawlingSessionCQ.java +++ b/src/main/java/org/codelibs/fess/es/config/cbean/cq/bs/BsCrawlingInfoCQ.java @@ -15,11 +15,11 @@ */ package org.codelibs.fess.es.config.cbean.cq.bs; -import java.time.LocalDateTime; +import java.time.*; import java.util.Collection; import org.codelibs.fess.es.config.allcommon.EsAbstractConditionQuery; -import org.codelibs.fess.es.config.cbean.cq.CrawlingSessionCQ; +import org.codelibs.fess.es.config.cbean.cq.CrawlingInfoCQ; import org.dbflute.cbean.ckey.ConditionKey; import org.dbflute.exception.IllegalConditionBeanOperationException; import org.elasticsearch.index.query.BoolQueryBuilder; @@ -33,10 +33,11 @@ import org.elasticsearch.index.query.RangeQueryBuilder; import org.elasticsearch.index.query.TermQueryBuilder; import org.elasticsearch.index.query.TermsQueryBuilder; + /** * @author ESFlute (using FreeGen) */ -public abstract class BsCrawlingSessionCQ extends EsAbstractConditionQuery { +public abstract class BsCrawlingInfoCQ extends EsAbstractConditionQuery { protected static final Class suppressUnusedImportLocalDateTime = LocalDateTime.class; @@ -45,33 +46,34 @@ public abstract class BsCrawlingSessionCQ extends EsAbstractConditionQuery { // ============= @Override public String asTableDbName() { - return "crawling_session"; + return "crawling_info"; } @Override public String xgetAliasName() { - return "crawling_session"; + return "crawling_info"; } // =================================================================================== // Query Control // ============= - public void filtered(FilteredCall filteredLambda) { + public void filtered(FilteredCall filteredLambda) { filtered(filteredLambda, null); } - public void filtered(FilteredCall filteredLambda, ConditionOptionCall opLambda) { - bool((must, should, mustNot, filter) -> { + public void filtered(FilteredCall filteredLambda, + ConditionOptionCall opLambda) { + bool((must, should, mustNot, filter)->{ filteredLambda.callback(must, filter); }, opLambda); } - public void not(OperatorCall notLambda) { + public void not(OperatorCall notLambda) { not(notLambda, null); } - public void not(OperatorCall notLambda, ConditionOptionCall opLambda) { - CrawlingSessionCQ notQuery = new CrawlingSessionCQ(); + public void not(OperatorCall notLambda, ConditionOptionCall opLambda) { + CrawlingInfoCQ notQuery = new CrawlingInfoCQ(); notLambda.callback(notQuery); if (notQuery.hasQueries()) { if (notQuery.getQueryBuilderList().size() > 1) { @@ -85,20 +87,18 @@ public abstract class BsCrawlingSessionCQ extends EsAbstractConditionQuery { } } - public void bool(BoolCall boolLambda) { + public void bool(BoolCall boolLambda) { bool(boolLambda, null); } - public void bool(BoolCall boolLambda, ConditionOptionCall opLambda) { - CrawlingSessionCQ mustQuery = new CrawlingSessionCQ(); - CrawlingSessionCQ shouldQuery = new CrawlingSessionCQ(); - CrawlingSessionCQ mustNotQuery = new CrawlingSessionCQ(); - CrawlingSessionCQ filterQuery = new CrawlingSessionCQ(); + public void bool(BoolCall boolLambda, ConditionOptionCall opLambda) { + CrawlingInfoCQ mustQuery = new CrawlingInfoCQ(); + CrawlingInfoCQ shouldQuery = new CrawlingInfoCQ(); + CrawlingInfoCQ mustNotQuery = new CrawlingInfoCQ(); + CrawlingInfoCQ filterQuery = new CrawlingInfoCQ(); boolLambda.callback(mustQuery, shouldQuery, mustNotQuery, filterQuery); if (mustQuery.hasQueries() || shouldQuery.hasQueries() || mustNotQuery.hasQueries() || filterQuery.hasQueries()) { - BoolQueryBuilder builder = - regBoolCQ(mustQuery.getQueryBuilderList(), shouldQuery.getQueryBuilderList(), mustNotQuery.getQueryBuilderList(), - filterQuery.getQueryBuilderList()); + BoolQueryBuilder builder = regBoolCQ(mustQuery.getQueryBuilderList(), shouldQuery.getQueryBuilderList(), mustNotQuery.getQueryBuilderList(), filterQuery.getQueryBuilderList()); if (opLambda != null) { opLambda.callback(builder); } @@ -165,12 +165,12 @@ public abstract class BsCrawlingSessionCQ extends EsAbstractConditionQuery { setId_Terms(idList, opLambda); } - public BsCrawlingSessionCQ addOrderBy_Id_Asc() { + public BsCrawlingInfoCQ addOrderBy_Id_Asc() { regOBA("_id"); return this; } - public BsCrawlingSessionCQ addOrderBy_Id_Desc() { + public BsCrawlingInfoCQ addOrderBy_Id_Desc() { regOBD("_id"); return this; } @@ -320,12 +320,12 @@ public abstract class BsCrawlingSessionCQ extends EsAbstractConditionQuery { } } - public BsCrawlingSessionCQ addOrderBy_CreatedTime_Asc() { + public BsCrawlingInfoCQ addOrderBy_CreatedTime_Asc() { regOBA("createdTime"); return this; } - public BsCrawlingSessionCQ addOrderBy_CreatedTime_Desc() { + public BsCrawlingInfoCQ addOrderBy_CreatedTime_Desc() { regOBD("createdTime"); return this; } @@ -475,12 +475,12 @@ public abstract class BsCrawlingSessionCQ extends EsAbstractConditionQuery { } } - public BsCrawlingSessionCQ addOrderBy_ExpiredTime_Asc() { + public BsCrawlingInfoCQ addOrderBy_ExpiredTime_Asc() { regOBA("expiredTime"); return this; } - public BsCrawlingSessionCQ addOrderBy_ExpiredTime_Desc() { + public BsCrawlingInfoCQ addOrderBy_ExpiredTime_Desc() { regOBD("expiredTime"); return this; } @@ -641,12 +641,12 @@ public abstract class BsCrawlingSessionCQ extends EsAbstractConditionQuery { } } - public BsCrawlingSessionCQ addOrderBy_Name_Asc() { + public BsCrawlingInfoCQ addOrderBy_Name_Asc() { regOBA("name"); return this; } - public BsCrawlingSessionCQ addOrderBy_Name_Desc() { + public BsCrawlingInfoCQ addOrderBy_Name_Desc() { regOBD("name"); return this; } @@ -807,12 +807,12 @@ public abstract class BsCrawlingSessionCQ extends EsAbstractConditionQuery { } } - public BsCrawlingSessionCQ addOrderBy_SessionId_Asc() { + public BsCrawlingInfoCQ addOrderBy_SessionId_Asc() { regOBA("sessionId"); return this; } - public BsCrawlingSessionCQ addOrderBy_SessionId_Desc() { + public BsCrawlingInfoCQ addOrderBy_SessionId_Desc() { regOBD("sessionId"); return this; } diff --git a/src/main/java/org/codelibs/fess/es/config/cbean/cq/bs/BsCrawlingSessionInfoCQ.java b/src/main/java/org/codelibs/fess/es/config/cbean/cq/bs/BsCrawlingInfoParamCQ.java similarity index 75% rename from src/main/java/org/codelibs/fess/es/config/cbean/cq/bs/BsCrawlingSessionInfoCQ.java rename to src/main/java/org/codelibs/fess/es/config/cbean/cq/bs/BsCrawlingInfoParamCQ.java index a113096bf..cda828917 100644 --- a/src/main/java/org/codelibs/fess/es/config/cbean/cq/bs/BsCrawlingSessionInfoCQ.java +++ b/src/main/java/org/codelibs/fess/es/config/cbean/cq/bs/BsCrawlingInfoParamCQ.java @@ -15,11 +15,11 @@ */ package org.codelibs.fess.es.config.cbean.cq.bs; -import java.time.LocalDateTime; +import java.time.*; import java.util.Collection; import org.codelibs.fess.es.config.allcommon.EsAbstractConditionQuery; -import org.codelibs.fess.es.config.cbean.cq.CrawlingSessionInfoCQ; +import org.codelibs.fess.es.config.cbean.cq.CrawlingInfoParamCQ; import org.dbflute.cbean.ckey.ConditionKey; import org.dbflute.exception.IllegalConditionBeanOperationException; import org.elasticsearch.index.query.BoolQueryBuilder; @@ -33,10 +33,11 @@ import org.elasticsearch.index.query.RangeQueryBuilder; import org.elasticsearch.index.query.TermQueryBuilder; import org.elasticsearch.index.query.TermsQueryBuilder; + /** * @author ESFlute (using FreeGen) */ -public abstract class BsCrawlingSessionInfoCQ extends EsAbstractConditionQuery { +public abstract class BsCrawlingInfoParamCQ extends EsAbstractConditionQuery { protected static final Class suppressUnusedImportLocalDateTime = LocalDateTime.class; @@ -45,34 +46,34 @@ public abstract class BsCrawlingSessionInfoCQ extends EsAbstractConditionQuery { // ============= @Override public String asTableDbName() { - return "crawling_session_info"; + return "crawling_info_param"; } @Override public String xgetAliasName() { - return "crawling_session_info"; + return "crawling_info_param"; } // =================================================================================== // Query Control // ============= - public void filtered(FilteredCall filteredLambda) { + public void filtered(FilteredCall filteredLambda) { filtered(filteredLambda, null); } - public void filtered(FilteredCall filteredLambda, + public void filtered(FilteredCall filteredLambda, ConditionOptionCall opLambda) { - bool((must, should, mustNot, filter) -> { + bool((must, should, mustNot, filter)->{ filteredLambda.callback(must, filter); }, opLambda); } - public void not(OperatorCall notLambda) { + public void not(OperatorCall notLambda) { not(notLambda, null); } - public void not(OperatorCall notLambda, ConditionOptionCall opLambda) { - CrawlingSessionInfoCQ notQuery = new CrawlingSessionInfoCQ(); + public void not(OperatorCall notLambda, ConditionOptionCall opLambda) { + CrawlingInfoParamCQ notQuery = new CrawlingInfoParamCQ(); notLambda.callback(notQuery); if (notQuery.hasQueries()) { if (notQuery.getQueryBuilderList().size() > 1) { @@ -86,20 +87,18 @@ public abstract class BsCrawlingSessionInfoCQ extends EsAbstractConditionQuery { } } - public void bool(BoolCall boolLambda) { + public void bool(BoolCall boolLambda) { bool(boolLambda, null); } - public void bool(BoolCall boolLambda, ConditionOptionCall opLambda) { - CrawlingSessionInfoCQ mustQuery = new CrawlingSessionInfoCQ(); - CrawlingSessionInfoCQ shouldQuery = new CrawlingSessionInfoCQ(); - CrawlingSessionInfoCQ mustNotQuery = new CrawlingSessionInfoCQ(); - CrawlingSessionInfoCQ filterQuery = new CrawlingSessionInfoCQ(); + public void bool(BoolCall boolLambda, ConditionOptionCall opLambda) { + CrawlingInfoParamCQ mustQuery = new CrawlingInfoParamCQ(); + CrawlingInfoParamCQ shouldQuery = new CrawlingInfoParamCQ(); + CrawlingInfoParamCQ mustNotQuery = new CrawlingInfoParamCQ(); + CrawlingInfoParamCQ filterQuery = new CrawlingInfoParamCQ(); boolLambda.callback(mustQuery, shouldQuery, mustNotQuery, filterQuery); if (mustQuery.hasQueries() || shouldQuery.hasQueries() || mustNotQuery.hasQueries() || filterQuery.hasQueries()) { - BoolQueryBuilder builder = - regBoolCQ(mustQuery.getQueryBuilderList(), shouldQuery.getQueryBuilderList(), mustNotQuery.getQueryBuilderList(), - filterQuery.getQueryBuilderList()); + BoolQueryBuilder builder = regBoolCQ(mustQuery.getQueryBuilderList(), shouldQuery.getQueryBuilderList(), mustNotQuery.getQueryBuilderList(), filterQuery.getQueryBuilderList()); if (opLambda != null) { opLambda.callback(builder); } @@ -166,179 +165,179 @@ public abstract class BsCrawlingSessionInfoCQ extends EsAbstractConditionQuery { setId_Terms(idList, opLambda); } - public BsCrawlingSessionInfoCQ addOrderBy_Id_Asc() { + public BsCrawlingInfoParamCQ addOrderBy_Id_Asc() { regOBA("_id"); return this; } - public BsCrawlingSessionInfoCQ addOrderBy_Id_Desc() { + public BsCrawlingInfoParamCQ addOrderBy_Id_Desc() { regOBD("_id"); return this; } - public void setCrawlingSessionId_Equal(String crawlingSessionId) { - setCrawlingSessionId_Term(crawlingSessionId, null); + public void setCrawlingInfoId_Equal(String crawlingInfoId) { + setCrawlingInfoId_Term(crawlingInfoId, null); } - public void setCrawlingSessionId_Equal(String crawlingSessionId, ConditionOptionCall opLambda) { - setCrawlingSessionId_Term(crawlingSessionId, opLambda); + public void setCrawlingInfoId_Equal(String crawlingInfoId, ConditionOptionCall opLambda) { + setCrawlingInfoId_Term(crawlingInfoId, opLambda); } - public void setCrawlingSessionId_Term(String crawlingSessionId) { - setCrawlingSessionId_Term(crawlingSessionId, null); + public void setCrawlingInfoId_Term(String crawlingInfoId) { + setCrawlingInfoId_Term(crawlingInfoId, null); } - public void setCrawlingSessionId_Term(String crawlingSessionId, ConditionOptionCall opLambda) { - TermQueryBuilder builder = regTermQ("crawlingSessionId", crawlingSessionId); + public void setCrawlingInfoId_Term(String crawlingInfoId, ConditionOptionCall opLambda) { + TermQueryBuilder builder = regTermQ("crawlingInfoId", crawlingInfoId); if (opLambda != null) { opLambda.callback(builder); } } - public void setCrawlingSessionId_NotEqual(String crawlingSessionId) { - setCrawlingSessionId_NotTerm(crawlingSessionId, null); + public void setCrawlingInfoId_NotEqual(String crawlingInfoId) { + setCrawlingInfoId_NotTerm(crawlingInfoId, null); } - public void setCrawlingSessionId_NotEqual(String crawlingSessionId, ConditionOptionCall opLambda) { - setCrawlingSessionId_NotTerm(crawlingSessionId, opLambda); + public void setCrawlingInfoId_NotEqual(String crawlingInfoId, ConditionOptionCall opLambda) { + setCrawlingInfoId_NotTerm(crawlingInfoId, opLambda); } - public void setCrawlingSessionId_NotTerm(String crawlingSessionId) { - setCrawlingSessionId_NotTerm(crawlingSessionId, null); + public void setCrawlingInfoId_NotTerm(String crawlingInfoId) { + setCrawlingInfoId_NotTerm(crawlingInfoId, null); } - public void setCrawlingSessionId_NotTerm(String crawlingSessionId, ConditionOptionCall opLambda) { - NotQueryBuilder builder = QueryBuilders.notQuery(regTermQ("crawlingSessionId", crawlingSessionId)); + public void setCrawlingInfoId_NotTerm(String crawlingInfoId, ConditionOptionCall opLambda) { + NotQueryBuilder builder = QueryBuilders.notQuery(regTermQ("crawlingInfoId", crawlingInfoId)); if (opLambda != null) { opLambda.callback(builder); } } - public void setCrawlingSessionId_Terms(Collection crawlingSessionIdList) { - setCrawlingSessionId_Terms(crawlingSessionIdList, null); + public void setCrawlingInfoId_Terms(Collection crawlingInfoIdList) { + setCrawlingInfoId_Terms(crawlingInfoIdList, null); } - public void setCrawlingSessionId_Terms(Collection crawlingSessionIdList, ConditionOptionCall opLambda) { - TermsQueryBuilder builder = regTermsQ("crawlingSessionId", crawlingSessionIdList); + public void setCrawlingInfoId_Terms(Collection crawlingInfoIdList, ConditionOptionCall opLambda) { + TermsQueryBuilder builder = regTermsQ("crawlingInfoId", crawlingInfoIdList); if (opLambda != null) { opLambda.callback(builder); } } - public void setCrawlingSessionId_InScope(Collection crawlingSessionIdList) { - setCrawlingSessionId_Terms(crawlingSessionIdList, null); + public void setCrawlingInfoId_InScope(Collection crawlingInfoIdList) { + setCrawlingInfoId_Terms(crawlingInfoIdList, null); } - public void setCrawlingSessionId_InScope(Collection crawlingSessionIdList, ConditionOptionCall opLambda) { - setCrawlingSessionId_Terms(crawlingSessionIdList, opLambda); + public void setCrawlingInfoId_InScope(Collection crawlingInfoIdList, ConditionOptionCall opLambda) { + setCrawlingInfoId_Terms(crawlingInfoIdList, opLambda); } - public void setCrawlingSessionId_Match(String crawlingSessionId) { - setCrawlingSessionId_Match(crawlingSessionId, null); + public void setCrawlingInfoId_Match(String crawlingInfoId) { + setCrawlingInfoId_Match(crawlingInfoId, null); } - public void setCrawlingSessionId_Match(String crawlingSessionId, ConditionOptionCall opLambda) { - MatchQueryBuilder builder = regMatchQ("crawlingSessionId", crawlingSessionId); + public void setCrawlingInfoId_Match(String crawlingInfoId, ConditionOptionCall opLambda) { + MatchQueryBuilder builder = regMatchQ("crawlingInfoId", crawlingInfoId); if (opLambda != null) { opLambda.callback(builder); } } - public void setCrawlingSessionId_MatchPhrase(String crawlingSessionId) { - setCrawlingSessionId_MatchPhrase(crawlingSessionId, null); + public void setCrawlingInfoId_MatchPhrase(String crawlingInfoId) { + setCrawlingInfoId_MatchPhrase(crawlingInfoId, null); } - public void setCrawlingSessionId_MatchPhrase(String crawlingSessionId, ConditionOptionCall opLambda) { - MatchQueryBuilder builder = regMatchPhraseQ("crawlingSessionId", crawlingSessionId); + public void setCrawlingInfoId_MatchPhrase(String crawlingInfoId, ConditionOptionCall opLambda) { + MatchQueryBuilder builder = regMatchPhraseQ("crawlingInfoId", crawlingInfoId); if (opLambda != null) { opLambda.callback(builder); } } - public void setCrawlingSessionId_MatchPhrasePrefix(String crawlingSessionId) { - setCrawlingSessionId_MatchPhrasePrefix(crawlingSessionId, null); + public void setCrawlingInfoId_MatchPhrasePrefix(String crawlingInfoId) { + setCrawlingInfoId_MatchPhrasePrefix(crawlingInfoId, null); } - public void setCrawlingSessionId_MatchPhrasePrefix(String crawlingSessionId, ConditionOptionCall opLambda) { - MatchQueryBuilder builder = regMatchPhrasePrefixQ("crawlingSessionId", crawlingSessionId); + public void setCrawlingInfoId_MatchPhrasePrefix(String crawlingInfoId, ConditionOptionCall opLambda) { + MatchQueryBuilder builder = regMatchPhrasePrefixQ("crawlingInfoId", crawlingInfoId); if (opLambda != null) { opLambda.callback(builder); } } - public void setCrawlingSessionId_Fuzzy(String crawlingSessionId) { - setCrawlingSessionId_Fuzzy(crawlingSessionId, null); + public void setCrawlingInfoId_Fuzzy(String crawlingInfoId) { + setCrawlingInfoId_Fuzzy(crawlingInfoId, null); } - public void setCrawlingSessionId_Fuzzy(String crawlingSessionId, ConditionOptionCall opLambda) { - FuzzyQueryBuilder builder = regFuzzyQ("crawlingSessionId", crawlingSessionId); + public void setCrawlingInfoId_Fuzzy(String crawlingInfoId, ConditionOptionCall opLambda) { + FuzzyQueryBuilder builder = regFuzzyQ("crawlingInfoId", crawlingInfoId); if (opLambda != null) { opLambda.callback(builder); } } - public void setCrawlingSessionId_Prefix(String crawlingSessionId) { - setCrawlingSessionId_Prefix(crawlingSessionId, null); + public void setCrawlingInfoId_Prefix(String crawlingInfoId) { + setCrawlingInfoId_Prefix(crawlingInfoId, null); } - public void setCrawlingSessionId_Prefix(String crawlingSessionId, ConditionOptionCall opLambda) { - PrefixQueryBuilder builder = regPrefixQ("crawlingSessionId", crawlingSessionId); + public void setCrawlingInfoId_Prefix(String crawlingInfoId, ConditionOptionCall opLambda) { + PrefixQueryBuilder builder = regPrefixQ("crawlingInfoId", crawlingInfoId); if (opLambda != null) { opLambda.callback(builder); } } - public void setCrawlingSessionId_GreaterThan(String crawlingSessionId) { - setCrawlingSessionId_GreaterThan(crawlingSessionId, null); + public void setCrawlingInfoId_GreaterThan(String crawlingInfoId) { + setCrawlingInfoId_GreaterThan(crawlingInfoId, null); } - public void setCrawlingSessionId_GreaterThan(String crawlingSessionId, ConditionOptionCall opLambda) { - RangeQueryBuilder builder = regRangeQ("crawlingSessionId", ConditionKey.CK_GREATER_THAN, crawlingSessionId); + public void setCrawlingInfoId_GreaterThan(String crawlingInfoId, ConditionOptionCall opLambda) { + RangeQueryBuilder builder = regRangeQ("crawlingInfoId", ConditionKey.CK_GREATER_THAN, crawlingInfoId); if (opLambda != null) { opLambda.callback(builder); } } - public void setCrawlingSessionId_LessThan(String crawlingSessionId) { - setCrawlingSessionId_LessThan(crawlingSessionId, null); + public void setCrawlingInfoId_LessThan(String crawlingInfoId) { + setCrawlingInfoId_LessThan(crawlingInfoId, null); } - public void setCrawlingSessionId_LessThan(String crawlingSessionId, ConditionOptionCall opLambda) { - RangeQueryBuilder builder = regRangeQ("crawlingSessionId", ConditionKey.CK_LESS_THAN, crawlingSessionId); + public void setCrawlingInfoId_LessThan(String crawlingInfoId, ConditionOptionCall opLambda) { + RangeQueryBuilder builder = regRangeQ("crawlingInfoId", ConditionKey.CK_LESS_THAN, crawlingInfoId); if (opLambda != null) { opLambda.callback(builder); } } - public void setCrawlingSessionId_GreaterEqual(String crawlingSessionId) { - setCrawlingSessionId_GreaterEqual(crawlingSessionId, null); + public void setCrawlingInfoId_GreaterEqual(String crawlingInfoId) { + setCrawlingInfoId_GreaterEqual(crawlingInfoId, null); } - public void setCrawlingSessionId_GreaterEqual(String crawlingSessionId, ConditionOptionCall opLambda) { - RangeQueryBuilder builder = regRangeQ("crawlingSessionId", ConditionKey.CK_GREATER_EQUAL, crawlingSessionId); + public void setCrawlingInfoId_GreaterEqual(String crawlingInfoId, ConditionOptionCall opLambda) { + RangeQueryBuilder builder = regRangeQ("crawlingInfoId", ConditionKey.CK_GREATER_EQUAL, crawlingInfoId); if (opLambda != null) { opLambda.callback(builder); } } - public void setCrawlingSessionId_LessEqual(String crawlingSessionId) { - setCrawlingSessionId_LessEqual(crawlingSessionId, null); + public void setCrawlingInfoId_LessEqual(String crawlingInfoId) { + setCrawlingInfoId_LessEqual(crawlingInfoId, null); } - public void setCrawlingSessionId_LessEqual(String crawlingSessionId, ConditionOptionCall opLambda) { - RangeQueryBuilder builder = regRangeQ("crawlingSessionId", ConditionKey.CK_LESS_EQUAL, crawlingSessionId); + public void setCrawlingInfoId_LessEqual(String crawlingInfoId, ConditionOptionCall opLambda) { + RangeQueryBuilder builder = regRangeQ("crawlingInfoId", ConditionKey.CK_LESS_EQUAL, crawlingInfoId); if (opLambda != null) { opLambda.callback(builder); } } - public BsCrawlingSessionInfoCQ addOrderBy_CrawlingSessionId_Asc() { - regOBA("crawlingSessionId"); + public BsCrawlingInfoParamCQ addOrderBy_CrawlingInfoId_Asc() { + regOBA("crawlingInfoId"); return this; } - public BsCrawlingSessionInfoCQ addOrderBy_CrawlingSessionId_Desc() { - regOBD("crawlingSessionId"); + public BsCrawlingInfoParamCQ addOrderBy_CrawlingInfoId_Desc() { + regOBD("crawlingInfoId"); return this; } @@ -487,12 +486,12 @@ public abstract class BsCrawlingSessionInfoCQ extends EsAbstractConditionQuery { } } - public BsCrawlingSessionInfoCQ addOrderBy_CreatedTime_Asc() { + public BsCrawlingInfoParamCQ addOrderBy_CreatedTime_Asc() { regOBA("createdTime"); return this; } - public BsCrawlingSessionInfoCQ addOrderBy_CreatedTime_Desc() { + public BsCrawlingInfoParamCQ addOrderBy_CreatedTime_Desc() { regOBD("createdTime"); return this; } @@ -653,12 +652,12 @@ public abstract class BsCrawlingSessionInfoCQ extends EsAbstractConditionQuery { } } - public BsCrawlingSessionInfoCQ addOrderBy_Key_Asc() { + public BsCrawlingInfoParamCQ addOrderBy_Key_Asc() { regOBA("key"); return this; } - public BsCrawlingSessionInfoCQ addOrderBy_Key_Desc() { + public BsCrawlingInfoParamCQ addOrderBy_Key_Desc() { regOBD("key"); return this; } @@ -819,12 +818,12 @@ public abstract class BsCrawlingSessionInfoCQ extends EsAbstractConditionQuery { } } - public BsCrawlingSessionInfoCQ addOrderBy_Value_Asc() { + public BsCrawlingInfoParamCQ addOrderBy_Value_Asc() { regOBA("value"); return this; } - public BsCrawlingSessionInfoCQ addOrderBy_Value_Desc() { + public BsCrawlingInfoParamCQ addOrderBy_Value_Desc() { regOBD("value"); return this; } diff --git a/src/main/java/org/codelibs/fess/es/config/cbean/cq/bs/BsDataConfigCQ.java b/src/main/java/org/codelibs/fess/es/config/cbean/cq/bs/BsDataConfigCQ.java index d95f7d4ed..6764c64f8 100644 --- a/src/main/java/org/codelibs/fess/es/config/cbean/cq/bs/BsDataConfigCQ.java +++ b/src/main/java/org/codelibs/fess/es/config/cbean/cq/bs/BsDataConfigCQ.java @@ -15,7 +15,7 @@ */ package org.codelibs.fess.es.config.cbean.cq.bs; -import java.time.LocalDateTime; +import java.time.*; import java.util.Collection; import org.codelibs.fess.es.config.allcommon.EsAbstractConditionQuery; @@ -33,6 +33,7 @@ import org.elasticsearch.index.query.RangeQueryBuilder; import org.elasticsearch.index.query.TermQueryBuilder; import org.elasticsearch.index.query.TermsQueryBuilder; + /** * @author ESFlute (using FreeGen) */ @@ -60,8 +61,9 @@ public abstract class BsDataConfigCQ extends EsAbstractConditionQuery { filtered(filteredLambda, null); } - public void filtered(FilteredCall filteredLambda, ConditionOptionCall opLambda) { - bool((must, should, mustNot, filter) -> { + public void filtered(FilteredCall filteredLambda, + ConditionOptionCall opLambda) { + bool((must, should, mustNot, filter)->{ filteredLambda.callback(must, filter); }, opLambda); } @@ -96,9 +98,7 @@ public abstract class BsDataConfigCQ extends EsAbstractConditionQuery { DataConfigCQ filterQuery = new DataConfigCQ(); boolLambda.callback(mustQuery, shouldQuery, mustNotQuery, filterQuery); if (mustQuery.hasQueries() || shouldQuery.hasQueries() || mustNotQuery.hasQueries() || filterQuery.hasQueries()) { - BoolQueryBuilder builder = - regBoolCQ(mustQuery.getQueryBuilderList(), shouldQuery.getQueryBuilderList(), mustNotQuery.getQueryBuilderList(), - filterQuery.getQueryBuilderList()); + BoolQueryBuilder builder = regBoolCQ(mustQuery.getQueryBuilderList(), shouldQuery.getQueryBuilderList(), mustNotQuery.getQueryBuilderList(), filterQuery.getQueryBuilderList()); if (opLambda != null) { opLambda.callback(builder); } diff --git a/src/main/java/org/codelibs/fess/es/config/cbean/cq/bs/BsDataConfigToLabelCQ.java b/src/main/java/org/codelibs/fess/es/config/cbean/cq/bs/BsDataConfigToLabelCQ.java index 0ba1bd4b8..c6767fd3c 100644 --- a/src/main/java/org/codelibs/fess/es/config/cbean/cq/bs/BsDataConfigToLabelCQ.java +++ b/src/main/java/org/codelibs/fess/es/config/cbean/cq/bs/BsDataConfigToLabelCQ.java @@ -15,7 +15,7 @@ */ package org.codelibs.fess.es.config.cbean.cq.bs; -import java.time.LocalDateTime; +import java.time.*; import java.util.Collection; import org.codelibs.fess.es.config.allcommon.EsAbstractConditionQuery; @@ -33,6 +33,7 @@ import org.elasticsearch.index.query.RangeQueryBuilder; import org.elasticsearch.index.query.TermQueryBuilder; import org.elasticsearch.index.query.TermsQueryBuilder; + /** * @author ESFlute (using FreeGen) */ @@ -62,7 +63,7 @@ public abstract class BsDataConfigToLabelCQ extends EsAbstractConditionQuery { public void filtered(FilteredCall filteredLambda, ConditionOptionCall opLambda) { - bool((must, should, mustNot, filter) -> { + bool((must, should, mustNot, filter)->{ filteredLambda.callback(must, filter); }, opLambda); } @@ -97,9 +98,7 @@ public abstract class BsDataConfigToLabelCQ extends EsAbstractConditionQuery { DataConfigToLabelCQ filterQuery = new DataConfigToLabelCQ(); boolLambda.callback(mustQuery, shouldQuery, mustNotQuery, filterQuery); if (mustQuery.hasQueries() || shouldQuery.hasQueries() || mustNotQuery.hasQueries() || filterQuery.hasQueries()) { - BoolQueryBuilder builder = - regBoolCQ(mustQuery.getQueryBuilderList(), shouldQuery.getQueryBuilderList(), mustNotQuery.getQueryBuilderList(), - filterQuery.getQueryBuilderList()); + BoolQueryBuilder builder = regBoolCQ(mustQuery.getQueryBuilderList(), shouldQuery.getQueryBuilderList(), mustNotQuery.getQueryBuilderList(), filterQuery.getQueryBuilderList()); if (opLambda != null) { opLambda.callback(builder); } diff --git a/src/main/java/org/codelibs/fess/es/config/cbean/cq/bs/BsDataConfigToRoleCQ.java b/src/main/java/org/codelibs/fess/es/config/cbean/cq/bs/BsDataConfigToRoleCQ.java index 92c6b50bd..018afe4f2 100644 --- a/src/main/java/org/codelibs/fess/es/config/cbean/cq/bs/BsDataConfigToRoleCQ.java +++ b/src/main/java/org/codelibs/fess/es/config/cbean/cq/bs/BsDataConfigToRoleCQ.java @@ -15,7 +15,7 @@ */ package org.codelibs.fess.es.config.cbean.cq.bs; -import java.time.LocalDateTime; +import java.time.*; import java.util.Collection; import org.codelibs.fess.es.config.allcommon.EsAbstractConditionQuery; @@ -33,6 +33,7 @@ import org.elasticsearch.index.query.RangeQueryBuilder; import org.elasticsearch.index.query.TermQueryBuilder; import org.elasticsearch.index.query.TermsQueryBuilder; + /** * @author ESFlute (using FreeGen) */ @@ -60,8 +61,9 @@ public abstract class BsDataConfigToRoleCQ extends EsAbstractConditionQuery { filtered(filteredLambda, null); } - public void filtered(FilteredCall filteredLambda, ConditionOptionCall opLambda) { - bool((must, should, mustNot, filter) -> { + public void filtered(FilteredCall filteredLambda, + ConditionOptionCall opLambda) { + bool((must, should, mustNot, filter)->{ filteredLambda.callback(must, filter); }, opLambda); } @@ -96,9 +98,7 @@ public abstract class BsDataConfigToRoleCQ extends EsAbstractConditionQuery { DataConfigToRoleCQ filterQuery = new DataConfigToRoleCQ(); boolLambda.callback(mustQuery, shouldQuery, mustNotQuery, filterQuery); if (mustQuery.hasQueries() || shouldQuery.hasQueries() || mustNotQuery.hasQueries() || filterQuery.hasQueries()) { - BoolQueryBuilder builder = - regBoolCQ(mustQuery.getQueryBuilderList(), shouldQuery.getQueryBuilderList(), mustNotQuery.getQueryBuilderList(), - filterQuery.getQueryBuilderList()); + BoolQueryBuilder builder = regBoolCQ(mustQuery.getQueryBuilderList(), shouldQuery.getQueryBuilderList(), mustNotQuery.getQueryBuilderList(), filterQuery.getQueryBuilderList()); if (opLambda != null) { opLambda.callback(builder); } diff --git a/src/main/java/org/codelibs/fess/es/config/cbean/cq/bs/BsDuplicateHostCQ.java b/src/main/java/org/codelibs/fess/es/config/cbean/cq/bs/BsDuplicateHostCQ.java index 9334c0e0b..25b405712 100644 --- a/src/main/java/org/codelibs/fess/es/config/cbean/cq/bs/BsDuplicateHostCQ.java +++ b/src/main/java/org/codelibs/fess/es/config/cbean/cq/bs/BsDuplicateHostCQ.java @@ -15,7 +15,7 @@ */ package org.codelibs.fess.es.config.cbean.cq.bs; -import java.time.LocalDateTime; +import java.time.*; import java.util.Collection; import org.codelibs.fess.es.config.allcommon.EsAbstractConditionQuery; @@ -33,6 +33,7 @@ import org.elasticsearch.index.query.RangeQueryBuilder; import org.elasticsearch.index.query.TermQueryBuilder; import org.elasticsearch.index.query.TermsQueryBuilder; + /** * @author ESFlute (using FreeGen) */ @@ -60,8 +61,9 @@ public abstract class BsDuplicateHostCQ extends EsAbstractConditionQuery { filtered(filteredLambda, null); } - public void filtered(FilteredCall filteredLambda, ConditionOptionCall opLambda) { - bool((must, should, mustNot, filter) -> { + public void filtered(FilteredCall filteredLambda, + ConditionOptionCall opLambda) { + bool((must, should, mustNot, filter)->{ filteredLambda.callback(must, filter); }, opLambda); } @@ -96,9 +98,7 @@ public abstract class BsDuplicateHostCQ extends EsAbstractConditionQuery { DuplicateHostCQ filterQuery = new DuplicateHostCQ(); boolLambda.callback(mustQuery, shouldQuery, mustNotQuery, filterQuery); if (mustQuery.hasQueries() || shouldQuery.hasQueries() || mustNotQuery.hasQueries() || filterQuery.hasQueries()) { - BoolQueryBuilder builder = - regBoolCQ(mustQuery.getQueryBuilderList(), shouldQuery.getQueryBuilderList(), mustNotQuery.getQueryBuilderList(), - filterQuery.getQueryBuilderList()); + BoolQueryBuilder builder = regBoolCQ(mustQuery.getQueryBuilderList(), shouldQuery.getQueryBuilderList(), mustNotQuery.getQueryBuilderList(), filterQuery.getQueryBuilderList()); if (opLambda != null) { opLambda.callback(builder); } diff --git a/src/main/java/org/codelibs/fess/es/config/cbean/cq/bs/BsFailureUrlCQ.java b/src/main/java/org/codelibs/fess/es/config/cbean/cq/bs/BsFailureUrlCQ.java index d3da1b2ca..3bd5afb56 100644 --- a/src/main/java/org/codelibs/fess/es/config/cbean/cq/bs/BsFailureUrlCQ.java +++ b/src/main/java/org/codelibs/fess/es/config/cbean/cq/bs/BsFailureUrlCQ.java @@ -15,7 +15,7 @@ */ package org.codelibs.fess.es.config.cbean.cq.bs; -import java.time.LocalDateTime; +import java.time.*; import java.util.Collection; import org.codelibs.fess.es.config.allcommon.EsAbstractConditionQuery; @@ -33,6 +33,7 @@ import org.elasticsearch.index.query.RangeQueryBuilder; import org.elasticsearch.index.query.TermQueryBuilder; import org.elasticsearch.index.query.TermsQueryBuilder; + /** * @author ESFlute (using FreeGen) */ @@ -60,8 +61,9 @@ public abstract class BsFailureUrlCQ extends EsAbstractConditionQuery { filtered(filteredLambda, null); } - public void filtered(FilteredCall filteredLambda, ConditionOptionCall opLambda) { - bool((must, should, mustNot, filter) -> { + public void filtered(FilteredCall filteredLambda, + ConditionOptionCall opLambda) { + bool((must, should, mustNot, filter)->{ filteredLambda.callback(must, filter); }, opLambda); } @@ -96,9 +98,7 @@ public abstract class BsFailureUrlCQ extends EsAbstractConditionQuery { FailureUrlCQ filterQuery = new FailureUrlCQ(); boolLambda.callback(mustQuery, shouldQuery, mustNotQuery, filterQuery); if (mustQuery.hasQueries() || shouldQuery.hasQueries() || mustNotQuery.hasQueries() || filterQuery.hasQueries()) { - BoolQueryBuilder builder = - regBoolCQ(mustQuery.getQueryBuilderList(), shouldQuery.getQueryBuilderList(), mustNotQuery.getQueryBuilderList(), - filterQuery.getQueryBuilderList()); + BoolQueryBuilder builder = regBoolCQ(mustQuery.getQueryBuilderList(), shouldQuery.getQueryBuilderList(), mustNotQuery.getQueryBuilderList(), filterQuery.getQueryBuilderList()); if (opLambda != null) { opLambda.callback(builder); } diff --git a/src/main/java/org/codelibs/fess/es/config/cbean/cq/bs/BsFileAuthenticationCQ.java b/src/main/java/org/codelibs/fess/es/config/cbean/cq/bs/BsFileAuthenticationCQ.java index e82e6ff0d..355f4cdfe 100644 --- a/src/main/java/org/codelibs/fess/es/config/cbean/cq/bs/BsFileAuthenticationCQ.java +++ b/src/main/java/org/codelibs/fess/es/config/cbean/cq/bs/BsFileAuthenticationCQ.java @@ -15,7 +15,7 @@ */ package org.codelibs.fess.es.config.cbean.cq.bs; -import java.time.LocalDateTime; +import java.time.*; import java.util.Collection; import org.codelibs.fess.es.config.allcommon.EsAbstractConditionQuery; @@ -33,6 +33,7 @@ import org.elasticsearch.index.query.RangeQueryBuilder; import org.elasticsearch.index.query.TermQueryBuilder; import org.elasticsearch.index.query.TermsQueryBuilder; + /** * @author ESFlute (using FreeGen) */ @@ -62,7 +63,7 @@ public abstract class BsFileAuthenticationCQ extends EsAbstractConditionQuery { public void filtered(FilteredCall filteredLambda, ConditionOptionCall opLambda) { - bool((must, should, mustNot, filter) -> { + bool((must, should, mustNot, filter)->{ filteredLambda.callback(must, filter); }, opLambda); } @@ -97,9 +98,7 @@ public abstract class BsFileAuthenticationCQ extends EsAbstractConditionQuery { FileAuthenticationCQ filterQuery = new FileAuthenticationCQ(); boolLambda.callback(mustQuery, shouldQuery, mustNotQuery, filterQuery); if (mustQuery.hasQueries() || shouldQuery.hasQueries() || mustNotQuery.hasQueries() || filterQuery.hasQueries()) { - BoolQueryBuilder builder = - regBoolCQ(mustQuery.getQueryBuilderList(), shouldQuery.getQueryBuilderList(), mustNotQuery.getQueryBuilderList(), - filterQuery.getQueryBuilderList()); + BoolQueryBuilder builder = regBoolCQ(mustQuery.getQueryBuilderList(), shouldQuery.getQueryBuilderList(), mustNotQuery.getQueryBuilderList(), filterQuery.getQueryBuilderList()); if (opLambda != null) { opLambda.callback(builder); } diff --git a/src/main/java/org/codelibs/fess/es/config/cbean/cq/bs/BsFileConfigCQ.java b/src/main/java/org/codelibs/fess/es/config/cbean/cq/bs/BsFileConfigCQ.java index 978f0d26c..870232983 100644 --- a/src/main/java/org/codelibs/fess/es/config/cbean/cq/bs/BsFileConfigCQ.java +++ b/src/main/java/org/codelibs/fess/es/config/cbean/cq/bs/BsFileConfigCQ.java @@ -15,7 +15,7 @@ */ package org.codelibs.fess.es.config.cbean.cq.bs; -import java.time.LocalDateTime; +import java.time.*; import java.util.Collection; import org.codelibs.fess.es.config.allcommon.EsAbstractConditionQuery; @@ -33,6 +33,7 @@ import org.elasticsearch.index.query.RangeQueryBuilder; import org.elasticsearch.index.query.TermQueryBuilder; import org.elasticsearch.index.query.TermsQueryBuilder; + /** * @author ESFlute (using FreeGen) */ @@ -60,8 +61,9 @@ public abstract class BsFileConfigCQ extends EsAbstractConditionQuery { filtered(filteredLambda, null); } - public void filtered(FilteredCall filteredLambda, ConditionOptionCall opLambda) { - bool((must, should, mustNot, filter) -> { + public void filtered(FilteredCall filteredLambda, + ConditionOptionCall opLambda) { + bool((must, should, mustNot, filter)->{ filteredLambda.callback(must, filter); }, opLambda); } @@ -96,9 +98,7 @@ public abstract class BsFileConfigCQ extends EsAbstractConditionQuery { FileConfigCQ filterQuery = new FileConfigCQ(); boolLambda.callback(mustQuery, shouldQuery, mustNotQuery, filterQuery); if (mustQuery.hasQueries() || shouldQuery.hasQueries() || mustNotQuery.hasQueries() || filterQuery.hasQueries()) { - BoolQueryBuilder builder = - regBoolCQ(mustQuery.getQueryBuilderList(), shouldQuery.getQueryBuilderList(), mustNotQuery.getQueryBuilderList(), - filterQuery.getQueryBuilderList()); + BoolQueryBuilder builder = regBoolCQ(mustQuery.getQueryBuilderList(), shouldQuery.getQueryBuilderList(), mustNotQuery.getQueryBuilderList(), filterQuery.getQueryBuilderList()); if (opLambda != null) { opLambda.callback(builder); } diff --git a/src/main/java/org/codelibs/fess/es/config/cbean/cq/bs/BsFileConfigToLabelCQ.java b/src/main/java/org/codelibs/fess/es/config/cbean/cq/bs/BsFileConfigToLabelCQ.java index 8796c6cd9..b491979bf 100644 --- a/src/main/java/org/codelibs/fess/es/config/cbean/cq/bs/BsFileConfigToLabelCQ.java +++ b/src/main/java/org/codelibs/fess/es/config/cbean/cq/bs/BsFileConfigToLabelCQ.java @@ -15,7 +15,7 @@ */ package org.codelibs.fess.es.config.cbean.cq.bs; -import java.time.LocalDateTime; +import java.time.*; import java.util.Collection; import org.codelibs.fess.es.config.allcommon.EsAbstractConditionQuery; @@ -33,6 +33,7 @@ import org.elasticsearch.index.query.RangeQueryBuilder; import org.elasticsearch.index.query.TermQueryBuilder; import org.elasticsearch.index.query.TermsQueryBuilder; + /** * @author ESFlute (using FreeGen) */ @@ -62,7 +63,7 @@ public abstract class BsFileConfigToLabelCQ extends EsAbstractConditionQuery { public void filtered(FilteredCall filteredLambda, ConditionOptionCall opLambda) { - bool((must, should, mustNot, filter) -> { + bool((must, should, mustNot, filter)->{ filteredLambda.callback(must, filter); }, opLambda); } @@ -97,9 +98,7 @@ public abstract class BsFileConfigToLabelCQ extends EsAbstractConditionQuery { FileConfigToLabelCQ filterQuery = new FileConfigToLabelCQ(); boolLambda.callback(mustQuery, shouldQuery, mustNotQuery, filterQuery); if (mustQuery.hasQueries() || shouldQuery.hasQueries() || mustNotQuery.hasQueries() || filterQuery.hasQueries()) { - BoolQueryBuilder builder = - regBoolCQ(mustQuery.getQueryBuilderList(), shouldQuery.getQueryBuilderList(), mustNotQuery.getQueryBuilderList(), - filterQuery.getQueryBuilderList()); + BoolQueryBuilder builder = regBoolCQ(mustQuery.getQueryBuilderList(), shouldQuery.getQueryBuilderList(), mustNotQuery.getQueryBuilderList(), filterQuery.getQueryBuilderList()); if (opLambda != null) { opLambda.callback(builder); } diff --git a/src/main/java/org/codelibs/fess/es/config/cbean/cq/bs/BsFileConfigToRoleCQ.java b/src/main/java/org/codelibs/fess/es/config/cbean/cq/bs/BsFileConfigToRoleCQ.java index dde73ee97..d16f1e003 100644 --- a/src/main/java/org/codelibs/fess/es/config/cbean/cq/bs/BsFileConfigToRoleCQ.java +++ b/src/main/java/org/codelibs/fess/es/config/cbean/cq/bs/BsFileConfigToRoleCQ.java @@ -15,7 +15,7 @@ */ package org.codelibs.fess.es.config.cbean.cq.bs; -import java.time.LocalDateTime; +import java.time.*; import java.util.Collection; import org.codelibs.fess.es.config.allcommon.EsAbstractConditionQuery; @@ -33,6 +33,7 @@ import org.elasticsearch.index.query.RangeQueryBuilder; import org.elasticsearch.index.query.TermQueryBuilder; import org.elasticsearch.index.query.TermsQueryBuilder; + /** * @author ESFlute (using FreeGen) */ @@ -60,8 +61,9 @@ public abstract class BsFileConfigToRoleCQ extends EsAbstractConditionQuery { filtered(filteredLambda, null); } - public void filtered(FilteredCall filteredLambda, ConditionOptionCall opLambda) { - bool((must, should, mustNot, filter) -> { + public void filtered(FilteredCall filteredLambda, + ConditionOptionCall opLambda) { + bool((must, should, mustNot, filter)->{ filteredLambda.callback(must, filter); }, opLambda); } @@ -96,9 +98,7 @@ public abstract class BsFileConfigToRoleCQ extends EsAbstractConditionQuery { FileConfigToRoleCQ filterQuery = new FileConfigToRoleCQ(); boolLambda.callback(mustQuery, shouldQuery, mustNotQuery, filterQuery); if (mustQuery.hasQueries() || shouldQuery.hasQueries() || mustNotQuery.hasQueries() || filterQuery.hasQueries()) { - BoolQueryBuilder builder = - regBoolCQ(mustQuery.getQueryBuilderList(), shouldQuery.getQueryBuilderList(), mustNotQuery.getQueryBuilderList(), - filterQuery.getQueryBuilderList()); + BoolQueryBuilder builder = regBoolCQ(mustQuery.getQueryBuilderList(), shouldQuery.getQueryBuilderList(), mustNotQuery.getQueryBuilderList(), filterQuery.getQueryBuilderList()); if (opLambda != null) { opLambda.callback(builder); } diff --git a/src/main/java/org/codelibs/fess/es/config/cbean/cq/bs/BsJobLogCQ.java b/src/main/java/org/codelibs/fess/es/config/cbean/cq/bs/BsJobLogCQ.java index bd9dc7786..0af1ad44a 100644 --- a/src/main/java/org/codelibs/fess/es/config/cbean/cq/bs/BsJobLogCQ.java +++ b/src/main/java/org/codelibs/fess/es/config/cbean/cq/bs/BsJobLogCQ.java @@ -15,7 +15,7 @@ */ package org.codelibs.fess.es.config.cbean.cq.bs; -import java.time.LocalDateTime; +import java.time.*; import java.util.Collection; import org.codelibs.fess.es.config.allcommon.EsAbstractConditionQuery; @@ -33,6 +33,7 @@ import org.elasticsearch.index.query.RangeQueryBuilder; import org.elasticsearch.index.query.TermQueryBuilder; import org.elasticsearch.index.query.TermsQueryBuilder; + /** * @author ESFlute (using FreeGen) */ @@ -60,8 +61,9 @@ public abstract class BsJobLogCQ extends EsAbstractConditionQuery { filtered(filteredLambda, null); } - public void filtered(FilteredCall filteredLambda, ConditionOptionCall opLambda) { - bool((must, should, mustNot, filter) -> { + public void filtered(FilteredCall filteredLambda, + ConditionOptionCall opLambda) { + bool((must, should, mustNot, filter)->{ filteredLambda.callback(must, filter); }, opLambda); } @@ -96,9 +98,7 @@ public abstract class BsJobLogCQ extends EsAbstractConditionQuery { JobLogCQ filterQuery = new JobLogCQ(); boolLambda.callback(mustQuery, shouldQuery, mustNotQuery, filterQuery); if (mustQuery.hasQueries() || shouldQuery.hasQueries() || mustNotQuery.hasQueries() || filterQuery.hasQueries()) { - BoolQueryBuilder builder = - regBoolCQ(mustQuery.getQueryBuilderList(), shouldQuery.getQueryBuilderList(), mustNotQuery.getQueryBuilderList(), - filterQuery.getQueryBuilderList()); + BoolQueryBuilder builder = regBoolCQ(mustQuery.getQueryBuilderList(), shouldQuery.getQueryBuilderList(), mustNotQuery.getQueryBuilderList(), filterQuery.getQueryBuilderList()); if (opLambda != null) { opLambda.callback(builder); } diff --git a/src/main/java/org/codelibs/fess/es/config/cbean/cq/bs/BsKeyMatchCQ.java b/src/main/java/org/codelibs/fess/es/config/cbean/cq/bs/BsKeyMatchCQ.java index 2d051225a..e81e857f4 100644 --- a/src/main/java/org/codelibs/fess/es/config/cbean/cq/bs/BsKeyMatchCQ.java +++ b/src/main/java/org/codelibs/fess/es/config/cbean/cq/bs/BsKeyMatchCQ.java @@ -15,7 +15,7 @@ */ package org.codelibs.fess.es.config.cbean.cq.bs; -import java.time.LocalDateTime; +import java.time.*; import java.util.Collection; import org.codelibs.fess.es.config.allcommon.EsAbstractConditionQuery; @@ -33,6 +33,7 @@ import org.elasticsearch.index.query.RangeQueryBuilder; import org.elasticsearch.index.query.TermQueryBuilder; import org.elasticsearch.index.query.TermsQueryBuilder; + /** * @author ESFlute (using FreeGen) */ @@ -60,8 +61,9 @@ public abstract class BsKeyMatchCQ extends EsAbstractConditionQuery { filtered(filteredLambda, null); } - public void filtered(FilteredCall filteredLambda, ConditionOptionCall opLambda) { - bool((must, should, mustNot, filter) -> { + public void filtered(FilteredCall filteredLambda, + ConditionOptionCall opLambda) { + bool((must, should, mustNot, filter)->{ filteredLambda.callback(must, filter); }, opLambda); } @@ -96,9 +98,7 @@ public abstract class BsKeyMatchCQ extends EsAbstractConditionQuery { KeyMatchCQ filterQuery = new KeyMatchCQ(); boolLambda.callback(mustQuery, shouldQuery, mustNotQuery, filterQuery); if (mustQuery.hasQueries() || shouldQuery.hasQueries() || mustNotQuery.hasQueries() || filterQuery.hasQueries()) { - BoolQueryBuilder builder = - regBoolCQ(mustQuery.getQueryBuilderList(), shouldQuery.getQueryBuilderList(), mustNotQuery.getQueryBuilderList(), - filterQuery.getQueryBuilderList()); + BoolQueryBuilder builder = regBoolCQ(mustQuery.getQueryBuilderList(), shouldQuery.getQueryBuilderList(), mustNotQuery.getQueryBuilderList(), filterQuery.getQueryBuilderList()); if (opLambda != null) { opLambda.callback(builder); } diff --git a/src/main/java/org/codelibs/fess/es/config/cbean/cq/bs/BsLabelToRoleCQ.java b/src/main/java/org/codelibs/fess/es/config/cbean/cq/bs/BsLabelToRoleCQ.java index 2972323ba..ab9a96d6e 100644 --- a/src/main/java/org/codelibs/fess/es/config/cbean/cq/bs/BsLabelToRoleCQ.java +++ b/src/main/java/org/codelibs/fess/es/config/cbean/cq/bs/BsLabelToRoleCQ.java @@ -15,7 +15,7 @@ */ package org.codelibs.fess.es.config.cbean.cq.bs; -import java.time.LocalDateTime; +import java.time.*; import java.util.Collection; import org.codelibs.fess.es.config.allcommon.EsAbstractConditionQuery; @@ -33,6 +33,7 @@ import org.elasticsearch.index.query.RangeQueryBuilder; import org.elasticsearch.index.query.TermQueryBuilder; import org.elasticsearch.index.query.TermsQueryBuilder; + /** * @author ESFlute (using FreeGen) */ @@ -60,8 +61,9 @@ public abstract class BsLabelToRoleCQ extends EsAbstractConditionQuery { filtered(filteredLambda, null); } - public void filtered(FilteredCall filteredLambda, ConditionOptionCall opLambda) { - bool((must, should, mustNot, filter) -> { + public void filtered(FilteredCall filteredLambda, + ConditionOptionCall opLambda) { + bool((must, should, mustNot, filter)->{ filteredLambda.callback(must, filter); }, opLambda); } @@ -96,9 +98,7 @@ public abstract class BsLabelToRoleCQ extends EsAbstractConditionQuery { LabelToRoleCQ filterQuery = new LabelToRoleCQ(); boolLambda.callback(mustQuery, shouldQuery, mustNotQuery, filterQuery); if (mustQuery.hasQueries() || shouldQuery.hasQueries() || mustNotQuery.hasQueries() || filterQuery.hasQueries()) { - BoolQueryBuilder builder = - regBoolCQ(mustQuery.getQueryBuilderList(), shouldQuery.getQueryBuilderList(), mustNotQuery.getQueryBuilderList(), - filterQuery.getQueryBuilderList()); + BoolQueryBuilder builder = regBoolCQ(mustQuery.getQueryBuilderList(), shouldQuery.getQueryBuilderList(), mustNotQuery.getQueryBuilderList(), filterQuery.getQueryBuilderList()); if (opLambda != null) { opLambda.callback(builder); } diff --git a/src/main/java/org/codelibs/fess/es/config/cbean/cq/bs/BsLabelTypeCQ.java b/src/main/java/org/codelibs/fess/es/config/cbean/cq/bs/BsLabelTypeCQ.java index b4f6077a1..5a53b2713 100644 --- a/src/main/java/org/codelibs/fess/es/config/cbean/cq/bs/BsLabelTypeCQ.java +++ b/src/main/java/org/codelibs/fess/es/config/cbean/cq/bs/BsLabelTypeCQ.java @@ -15,7 +15,7 @@ */ package org.codelibs.fess.es.config.cbean.cq.bs; -import java.time.LocalDateTime; +import java.time.*; import java.util.Collection; import org.codelibs.fess.es.config.allcommon.EsAbstractConditionQuery; @@ -33,6 +33,7 @@ import org.elasticsearch.index.query.RangeQueryBuilder; import org.elasticsearch.index.query.TermQueryBuilder; import org.elasticsearch.index.query.TermsQueryBuilder; + /** * @author ESFlute (using FreeGen) */ @@ -60,8 +61,9 @@ public abstract class BsLabelTypeCQ extends EsAbstractConditionQuery { filtered(filteredLambda, null); } - public void filtered(FilteredCall filteredLambda, ConditionOptionCall opLambda) { - bool((must, should, mustNot, filter) -> { + public void filtered(FilteredCall filteredLambda, + ConditionOptionCall opLambda) { + bool((must, should, mustNot, filter)->{ filteredLambda.callback(must, filter); }, opLambda); } @@ -96,9 +98,7 @@ public abstract class BsLabelTypeCQ extends EsAbstractConditionQuery { LabelTypeCQ filterQuery = new LabelTypeCQ(); boolLambda.callback(mustQuery, shouldQuery, mustNotQuery, filterQuery); if (mustQuery.hasQueries() || shouldQuery.hasQueries() || mustNotQuery.hasQueries() || filterQuery.hasQueries()) { - BoolQueryBuilder builder = - regBoolCQ(mustQuery.getQueryBuilderList(), shouldQuery.getQueryBuilderList(), mustNotQuery.getQueryBuilderList(), - filterQuery.getQueryBuilderList()); + BoolQueryBuilder builder = regBoolCQ(mustQuery.getQueryBuilderList(), shouldQuery.getQueryBuilderList(), mustNotQuery.getQueryBuilderList(), filterQuery.getQueryBuilderList()); if (opLambda != null) { opLambda.callback(builder); } diff --git a/src/main/java/org/codelibs/fess/es/config/cbean/cq/bs/BsPathMappingCQ.java b/src/main/java/org/codelibs/fess/es/config/cbean/cq/bs/BsPathMappingCQ.java index 524cff4aa..802b625a5 100644 --- a/src/main/java/org/codelibs/fess/es/config/cbean/cq/bs/BsPathMappingCQ.java +++ b/src/main/java/org/codelibs/fess/es/config/cbean/cq/bs/BsPathMappingCQ.java @@ -15,7 +15,7 @@ */ package org.codelibs.fess.es.config.cbean.cq.bs; -import java.time.LocalDateTime; +import java.time.*; import java.util.Collection; import org.codelibs.fess.es.config.allcommon.EsAbstractConditionQuery; @@ -33,6 +33,7 @@ import org.elasticsearch.index.query.RangeQueryBuilder; import org.elasticsearch.index.query.TermQueryBuilder; import org.elasticsearch.index.query.TermsQueryBuilder; + /** * @author ESFlute (using FreeGen) */ @@ -60,8 +61,9 @@ public abstract class BsPathMappingCQ extends EsAbstractConditionQuery { filtered(filteredLambda, null); } - public void filtered(FilteredCall filteredLambda, ConditionOptionCall opLambda) { - bool((must, should, mustNot, filter) -> { + public void filtered(FilteredCall filteredLambda, + ConditionOptionCall opLambda) { + bool((must, should, mustNot, filter)->{ filteredLambda.callback(must, filter); }, opLambda); } @@ -96,9 +98,7 @@ public abstract class BsPathMappingCQ extends EsAbstractConditionQuery { PathMappingCQ filterQuery = new PathMappingCQ(); boolLambda.callback(mustQuery, shouldQuery, mustNotQuery, filterQuery); if (mustQuery.hasQueries() || shouldQuery.hasQueries() || mustNotQuery.hasQueries() || filterQuery.hasQueries()) { - BoolQueryBuilder builder = - regBoolCQ(mustQuery.getQueryBuilderList(), shouldQuery.getQueryBuilderList(), mustNotQuery.getQueryBuilderList(), - filterQuery.getQueryBuilderList()); + BoolQueryBuilder builder = regBoolCQ(mustQuery.getQueryBuilderList(), shouldQuery.getQueryBuilderList(), mustNotQuery.getQueryBuilderList(), filterQuery.getQueryBuilderList()); if (opLambda != null) { opLambda.callback(builder); } diff --git a/src/main/java/org/codelibs/fess/es/config/cbean/cq/bs/BsRequestHeaderCQ.java b/src/main/java/org/codelibs/fess/es/config/cbean/cq/bs/BsRequestHeaderCQ.java index 087946ea9..000a42552 100644 --- a/src/main/java/org/codelibs/fess/es/config/cbean/cq/bs/BsRequestHeaderCQ.java +++ b/src/main/java/org/codelibs/fess/es/config/cbean/cq/bs/BsRequestHeaderCQ.java @@ -15,7 +15,7 @@ */ package org.codelibs.fess.es.config.cbean.cq.bs; -import java.time.LocalDateTime; +import java.time.*; import java.util.Collection; import org.codelibs.fess.es.config.allcommon.EsAbstractConditionQuery; @@ -33,6 +33,7 @@ import org.elasticsearch.index.query.RangeQueryBuilder; import org.elasticsearch.index.query.TermQueryBuilder; import org.elasticsearch.index.query.TermsQueryBuilder; + /** * @author ESFlute (using FreeGen) */ @@ -60,8 +61,9 @@ public abstract class BsRequestHeaderCQ extends EsAbstractConditionQuery { filtered(filteredLambda, null); } - public void filtered(FilteredCall filteredLambda, ConditionOptionCall opLambda) { - bool((must, should, mustNot, filter) -> { + public void filtered(FilteredCall filteredLambda, + ConditionOptionCall opLambda) { + bool((must, should, mustNot, filter)->{ filteredLambda.callback(must, filter); }, opLambda); } @@ -96,9 +98,7 @@ public abstract class BsRequestHeaderCQ extends EsAbstractConditionQuery { RequestHeaderCQ filterQuery = new RequestHeaderCQ(); boolLambda.callback(mustQuery, shouldQuery, mustNotQuery, filterQuery); if (mustQuery.hasQueries() || shouldQuery.hasQueries() || mustNotQuery.hasQueries() || filterQuery.hasQueries()) { - BoolQueryBuilder builder = - regBoolCQ(mustQuery.getQueryBuilderList(), shouldQuery.getQueryBuilderList(), mustNotQuery.getQueryBuilderList(), - filterQuery.getQueryBuilderList()); + BoolQueryBuilder builder = regBoolCQ(mustQuery.getQueryBuilderList(), shouldQuery.getQueryBuilderList(), mustNotQuery.getQueryBuilderList(), filterQuery.getQueryBuilderList()); if (opLambda != null) { opLambda.callback(builder); } diff --git a/src/main/java/org/codelibs/fess/es/config/cbean/cq/bs/BsRoleTypeCQ.java b/src/main/java/org/codelibs/fess/es/config/cbean/cq/bs/BsRoleTypeCQ.java index e0f93c602..688a76d2e 100644 --- a/src/main/java/org/codelibs/fess/es/config/cbean/cq/bs/BsRoleTypeCQ.java +++ b/src/main/java/org/codelibs/fess/es/config/cbean/cq/bs/BsRoleTypeCQ.java @@ -15,7 +15,7 @@ */ package org.codelibs.fess.es.config.cbean.cq.bs; -import java.time.LocalDateTime; +import java.time.*; import java.util.Collection; import org.codelibs.fess.es.config.allcommon.EsAbstractConditionQuery; @@ -33,6 +33,7 @@ import org.elasticsearch.index.query.RangeQueryBuilder; import org.elasticsearch.index.query.TermQueryBuilder; import org.elasticsearch.index.query.TermsQueryBuilder; + /** * @author ESFlute (using FreeGen) */ @@ -60,8 +61,9 @@ public abstract class BsRoleTypeCQ extends EsAbstractConditionQuery { filtered(filteredLambda, null); } - public void filtered(FilteredCall filteredLambda, ConditionOptionCall opLambda) { - bool((must, should, mustNot, filter) -> { + public void filtered(FilteredCall filteredLambda, + ConditionOptionCall opLambda) { + bool((must, should, mustNot, filter)->{ filteredLambda.callback(must, filter); }, opLambda); } @@ -96,9 +98,7 @@ public abstract class BsRoleTypeCQ extends EsAbstractConditionQuery { RoleTypeCQ filterQuery = new RoleTypeCQ(); boolLambda.callback(mustQuery, shouldQuery, mustNotQuery, filterQuery); if (mustQuery.hasQueries() || shouldQuery.hasQueries() || mustNotQuery.hasQueries() || filterQuery.hasQueries()) { - BoolQueryBuilder builder = - regBoolCQ(mustQuery.getQueryBuilderList(), shouldQuery.getQueryBuilderList(), mustNotQuery.getQueryBuilderList(), - filterQuery.getQueryBuilderList()); + BoolQueryBuilder builder = regBoolCQ(mustQuery.getQueryBuilderList(), shouldQuery.getQueryBuilderList(), mustNotQuery.getQueryBuilderList(), filterQuery.getQueryBuilderList()); if (opLambda != null) { opLambda.callback(builder); } diff --git a/src/main/java/org/codelibs/fess/es/config/cbean/cq/bs/BsScheduledJobCQ.java b/src/main/java/org/codelibs/fess/es/config/cbean/cq/bs/BsScheduledJobCQ.java index c704c2175..c8facfb76 100644 --- a/src/main/java/org/codelibs/fess/es/config/cbean/cq/bs/BsScheduledJobCQ.java +++ b/src/main/java/org/codelibs/fess/es/config/cbean/cq/bs/BsScheduledJobCQ.java @@ -15,7 +15,7 @@ */ package org.codelibs.fess.es.config.cbean.cq.bs; -import java.time.LocalDateTime; +import java.time.*; import java.util.Collection; import org.codelibs.fess.es.config.allcommon.EsAbstractConditionQuery; @@ -33,6 +33,7 @@ import org.elasticsearch.index.query.RangeQueryBuilder; import org.elasticsearch.index.query.TermQueryBuilder; import org.elasticsearch.index.query.TermsQueryBuilder; + /** * @author ESFlute (using FreeGen) */ @@ -60,8 +61,9 @@ public abstract class BsScheduledJobCQ extends EsAbstractConditionQuery { filtered(filteredLambda, null); } - public void filtered(FilteredCall filteredLambda, ConditionOptionCall opLambda) { - bool((must, should, mustNot, filter) -> { + public void filtered(FilteredCall filteredLambda, + ConditionOptionCall opLambda) { + bool((must, should, mustNot, filter)->{ filteredLambda.callback(must, filter); }, opLambda); } @@ -96,9 +98,7 @@ public abstract class BsScheduledJobCQ extends EsAbstractConditionQuery { ScheduledJobCQ filterQuery = new ScheduledJobCQ(); boolLambda.callback(mustQuery, shouldQuery, mustNotQuery, filterQuery); if (mustQuery.hasQueries() || shouldQuery.hasQueries() || mustNotQuery.hasQueries() || filterQuery.hasQueries()) { - BoolQueryBuilder builder = - regBoolCQ(mustQuery.getQueryBuilderList(), shouldQuery.getQueryBuilderList(), mustNotQuery.getQueryBuilderList(), - filterQuery.getQueryBuilderList()); + BoolQueryBuilder builder = regBoolCQ(mustQuery.getQueryBuilderList(), shouldQuery.getQueryBuilderList(), mustNotQuery.getQueryBuilderList(), filterQuery.getQueryBuilderList()); if (opLambda != null) { opLambda.callback(builder); } diff --git a/src/main/java/org/codelibs/fess/es/config/cbean/cq/bs/BsSuggestBadWordCQ.java b/src/main/java/org/codelibs/fess/es/config/cbean/cq/bs/BsSuggestBadWordCQ.java index cb1b2cba9..ae3c9cafa 100644 --- a/src/main/java/org/codelibs/fess/es/config/cbean/cq/bs/BsSuggestBadWordCQ.java +++ b/src/main/java/org/codelibs/fess/es/config/cbean/cq/bs/BsSuggestBadWordCQ.java @@ -15,7 +15,7 @@ */ package org.codelibs.fess.es.config.cbean.cq.bs; -import java.time.LocalDateTime; +import java.time.*; import java.util.Collection; import org.codelibs.fess.es.config.allcommon.EsAbstractConditionQuery; @@ -33,6 +33,7 @@ import org.elasticsearch.index.query.RangeQueryBuilder; import org.elasticsearch.index.query.TermQueryBuilder; import org.elasticsearch.index.query.TermsQueryBuilder; + /** * @author ESFlute (using FreeGen) */ @@ -60,8 +61,9 @@ public abstract class BsSuggestBadWordCQ extends EsAbstractConditionQuery { filtered(filteredLambda, null); } - public void filtered(FilteredCall filteredLambda, ConditionOptionCall opLambda) { - bool((must, should, mustNot, filter) -> { + public void filtered(FilteredCall filteredLambda, + ConditionOptionCall opLambda) { + bool((must, should, mustNot, filter)->{ filteredLambda.callback(must, filter); }, opLambda); } @@ -96,9 +98,7 @@ public abstract class BsSuggestBadWordCQ extends EsAbstractConditionQuery { SuggestBadWordCQ filterQuery = new SuggestBadWordCQ(); boolLambda.callback(mustQuery, shouldQuery, mustNotQuery, filterQuery); if (mustQuery.hasQueries() || shouldQuery.hasQueries() || mustNotQuery.hasQueries() || filterQuery.hasQueries()) { - BoolQueryBuilder builder = - regBoolCQ(mustQuery.getQueryBuilderList(), shouldQuery.getQueryBuilderList(), mustNotQuery.getQueryBuilderList(), - filterQuery.getQueryBuilderList()); + BoolQueryBuilder builder = regBoolCQ(mustQuery.getQueryBuilderList(), shouldQuery.getQueryBuilderList(), mustNotQuery.getQueryBuilderList(), filterQuery.getQueryBuilderList()); if (opLambda != null) { opLambda.callback(builder); } diff --git a/src/main/java/org/codelibs/fess/es/config/cbean/cq/bs/BsSuggestElevateWordCQ.java b/src/main/java/org/codelibs/fess/es/config/cbean/cq/bs/BsSuggestElevateWordCQ.java index b999f8612..6fd80a640 100644 --- a/src/main/java/org/codelibs/fess/es/config/cbean/cq/bs/BsSuggestElevateWordCQ.java +++ b/src/main/java/org/codelibs/fess/es/config/cbean/cq/bs/BsSuggestElevateWordCQ.java @@ -15,7 +15,7 @@ */ package org.codelibs.fess.es.config.cbean.cq.bs; -import java.time.LocalDateTime; +import java.time.*; import java.util.Collection; import org.codelibs.fess.es.config.allcommon.EsAbstractConditionQuery; @@ -33,6 +33,7 @@ import org.elasticsearch.index.query.RangeQueryBuilder; import org.elasticsearch.index.query.TermQueryBuilder; import org.elasticsearch.index.query.TermsQueryBuilder; + /** * @author ESFlute (using FreeGen) */ @@ -62,7 +63,7 @@ public abstract class BsSuggestElevateWordCQ extends EsAbstractConditionQuery { public void filtered(FilteredCall filteredLambda, ConditionOptionCall opLambda) { - bool((must, should, mustNot, filter) -> { + bool((must, should, mustNot, filter)->{ filteredLambda.callback(must, filter); }, opLambda); } @@ -97,9 +98,7 @@ public abstract class BsSuggestElevateWordCQ extends EsAbstractConditionQuery { SuggestElevateWordCQ filterQuery = new SuggestElevateWordCQ(); boolLambda.callback(mustQuery, shouldQuery, mustNotQuery, filterQuery); if (mustQuery.hasQueries() || shouldQuery.hasQueries() || mustNotQuery.hasQueries() || filterQuery.hasQueries()) { - BoolQueryBuilder builder = - regBoolCQ(mustQuery.getQueryBuilderList(), shouldQuery.getQueryBuilderList(), mustNotQuery.getQueryBuilderList(), - filterQuery.getQueryBuilderList()); + BoolQueryBuilder builder = regBoolCQ(mustQuery.getQueryBuilderList(), shouldQuery.getQueryBuilderList(), mustNotQuery.getQueryBuilderList(), filterQuery.getQueryBuilderList()); if (opLambda != null) { opLambda.callback(builder); } diff --git a/src/main/java/org/codelibs/fess/es/config/cbean/cq/bs/BsSuggestElevateWordToLabelCQ.java b/src/main/java/org/codelibs/fess/es/config/cbean/cq/bs/BsSuggestElevateWordToLabelCQ.java index 7c47ad004..9103e7baf 100644 --- a/src/main/java/org/codelibs/fess/es/config/cbean/cq/bs/BsSuggestElevateWordToLabelCQ.java +++ b/src/main/java/org/codelibs/fess/es/config/cbean/cq/bs/BsSuggestElevateWordToLabelCQ.java @@ -15,7 +15,7 @@ */ package org.codelibs.fess.es.config.cbean.cq.bs; -import java.time.LocalDateTime; +import java.time.*; import java.util.Collection; import org.codelibs.fess.es.config.allcommon.EsAbstractConditionQuery; @@ -33,6 +33,7 @@ import org.elasticsearch.index.query.RangeQueryBuilder; import org.elasticsearch.index.query.TermQueryBuilder; import org.elasticsearch.index.query.TermsQueryBuilder; + /** * @author ESFlute (using FreeGen) */ @@ -62,7 +63,7 @@ public abstract class BsSuggestElevateWordToLabelCQ extends EsAbstractConditionQ public void filtered(FilteredCall filteredLambda, ConditionOptionCall opLambda) { - bool((must, should, mustNot, filter) -> { + bool((must, should, mustNot, filter)->{ filteredLambda.callback(must, filter); }, opLambda); } @@ -97,9 +98,7 @@ public abstract class BsSuggestElevateWordToLabelCQ extends EsAbstractConditionQ SuggestElevateWordToLabelCQ filterQuery = new SuggestElevateWordToLabelCQ(); boolLambda.callback(mustQuery, shouldQuery, mustNotQuery, filterQuery); if (mustQuery.hasQueries() || shouldQuery.hasQueries() || mustNotQuery.hasQueries() || filterQuery.hasQueries()) { - BoolQueryBuilder builder = - regBoolCQ(mustQuery.getQueryBuilderList(), shouldQuery.getQueryBuilderList(), mustNotQuery.getQueryBuilderList(), - filterQuery.getQueryBuilderList()); + BoolQueryBuilder builder = regBoolCQ(mustQuery.getQueryBuilderList(), shouldQuery.getQueryBuilderList(), mustNotQuery.getQueryBuilderList(), filterQuery.getQueryBuilderList()); if (opLambda != null) { opLambda.callback(builder); } diff --git a/src/main/java/org/codelibs/fess/es/config/cbean/cq/bs/BsWebAuthenticationCQ.java b/src/main/java/org/codelibs/fess/es/config/cbean/cq/bs/BsWebAuthenticationCQ.java index b22ede256..8c9812129 100644 --- a/src/main/java/org/codelibs/fess/es/config/cbean/cq/bs/BsWebAuthenticationCQ.java +++ b/src/main/java/org/codelibs/fess/es/config/cbean/cq/bs/BsWebAuthenticationCQ.java @@ -15,7 +15,7 @@ */ package org.codelibs.fess.es.config.cbean.cq.bs; -import java.time.LocalDateTime; +import java.time.*; import java.util.Collection; import org.codelibs.fess.es.config.allcommon.EsAbstractConditionQuery; @@ -33,6 +33,7 @@ import org.elasticsearch.index.query.RangeQueryBuilder; import org.elasticsearch.index.query.TermQueryBuilder; import org.elasticsearch.index.query.TermsQueryBuilder; + /** * @author ESFlute (using FreeGen) */ @@ -62,7 +63,7 @@ public abstract class BsWebAuthenticationCQ extends EsAbstractConditionQuery { public void filtered(FilteredCall filteredLambda, ConditionOptionCall opLambda) { - bool((must, should, mustNot, filter) -> { + bool((must, should, mustNot, filter)->{ filteredLambda.callback(must, filter); }, opLambda); } @@ -97,9 +98,7 @@ public abstract class BsWebAuthenticationCQ extends EsAbstractConditionQuery { WebAuthenticationCQ filterQuery = new WebAuthenticationCQ(); boolLambda.callback(mustQuery, shouldQuery, mustNotQuery, filterQuery); if (mustQuery.hasQueries() || shouldQuery.hasQueries() || mustNotQuery.hasQueries() || filterQuery.hasQueries()) { - BoolQueryBuilder builder = - regBoolCQ(mustQuery.getQueryBuilderList(), shouldQuery.getQueryBuilderList(), mustNotQuery.getQueryBuilderList(), - filterQuery.getQueryBuilderList()); + BoolQueryBuilder builder = regBoolCQ(mustQuery.getQueryBuilderList(), shouldQuery.getQueryBuilderList(), mustNotQuery.getQueryBuilderList(), filterQuery.getQueryBuilderList()); if (opLambda != null) { opLambda.callback(builder); } diff --git a/src/main/java/org/codelibs/fess/es/config/cbean/cq/bs/BsWebConfigCQ.java b/src/main/java/org/codelibs/fess/es/config/cbean/cq/bs/BsWebConfigCQ.java index f7a7de806..14064bb4a 100644 --- a/src/main/java/org/codelibs/fess/es/config/cbean/cq/bs/BsWebConfigCQ.java +++ b/src/main/java/org/codelibs/fess/es/config/cbean/cq/bs/BsWebConfigCQ.java @@ -15,7 +15,7 @@ */ package org.codelibs.fess.es.config.cbean.cq.bs; -import java.time.LocalDateTime; +import java.time.*; import java.util.Collection; import org.codelibs.fess.es.config.allcommon.EsAbstractConditionQuery; @@ -33,6 +33,7 @@ import org.elasticsearch.index.query.RangeQueryBuilder; import org.elasticsearch.index.query.TermQueryBuilder; import org.elasticsearch.index.query.TermsQueryBuilder; + /** * @author ESFlute (using FreeGen) */ @@ -60,8 +61,9 @@ public abstract class BsWebConfigCQ extends EsAbstractConditionQuery { filtered(filteredLambda, null); } - public void filtered(FilteredCall filteredLambda, ConditionOptionCall opLambda) { - bool((must, should, mustNot, filter) -> { + public void filtered(FilteredCall filteredLambda, + ConditionOptionCall opLambda) { + bool((must, should, mustNot, filter)->{ filteredLambda.callback(must, filter); }, opLambda); } @@ -96,9 +98,7 @@ public abstract class BsWebConfigCQ extends EsAbstractConditionQuery { WebConfigCQ filterQuery = new WebConfigCQ(); boolLambda.callback(mustQuery, shouldQuery, mustNotQuery, filterQuery); if (mustQuery.hasQueries() || shouldQuery.hasQueries() || mustNotQuery.hasQueries() || filterQuery.hasQueries()) { - BoolQueryBuilder builder = - regBoolCQ(mustQuery.getQueryBuilderList(), shouldQuery.getQueryBuilderList(), mustNotQuery.getQueryBuilderList(), - filterQuery.getQueryBuilderList()); + BoolQueryBuilder builder = regBoolCQ(mustQuery.getQueryBuilderList(), shouldQuery.getQueryBuilderList(), mustNotQuery.getQueryBuilderList(), filterQuery.getQueryBuilderList()); if (opLambda != null) { opLambda.callback(builder); } diff --git a/src/main/java/org/codelibs/fess/es/config/cbean/cq/bs/BsWebConfigToLabelCQ.java b/src/main/java/org/codelibs/fess/es/config/cbean/cq/bs/BsWebConfigToLabelCQ.java index 5a7e6b815..e0b61159b 100644 --- a/src/main/java/org/codelibs/fess/es/config/cbean/cq/bs/BsWebConfigToLabelCQ.java +++ b/src/main/java/org/codelibs/fess/es/config/cbean/cq/bs/BsWebConfigToLabelCQ.java @@ -15,7 +15,7 @@ */ package org.codelibs.fess.es.config.cbean.cq.bs; -import java.time.LocalDateTime; +import java.time.*; import java.util.Collection; import org.codelibs.fess.es.config.allcommon.EsAbstractConditionQuery; @@ -33,6 +33,7 @@ import org.elasticsearch.index.query.RangeQueryBuilder; import org.elasticsearch.index.query.TermQueryBuilder; import org.elasticsearch.index.query.TermsQueryBuilder; + /** * @author ESFlute (using FreeGen) */ @@ -60,8 +61,9 @@ public abstract class BsWebConfigToLabelCQ extends EsAbstractConditionQuery { filtered(filteredLambda, null); } - public void filtered(FilteredCall filteredLambda, ConditionOptionCall opLambda) { - bool((must, should, mustNot, filter) -> { + public void filtered(FilteredCall filteredLambda, + ConditionOptionCall opLambda) { + bool((must, should, mustNot, filter)->{ filteredLambda.callback(must, filter); }, opLambda); } @@ -96,9 +98,7 @@ public abstract class BsWebConfigToLabelCQ extends EsAbstractConditionQuery { WebConfigToLabelCQ filterQuery = new WebConfigToLabelCQ(); boolLambda.callback(mustQuery, shouldQuery, mustNotQuery, filterQuery); if (mustQuery.hasQueries() || shouldQuery.hasQueries() || mustNotQuery.hasQueries() || filterQuery.hasQueries()) { - BoolQueryBuilder builder = - regBoolCQ(mustQuery.getQueryBuilderList(), shouldQuery.getQueryBuilderList(), mustNotQuery.getQueryBuilderList(), - filterQuery.getQueryBuilderList()); + BoolQueryBuilder builder = regBoolCQ(mustQuery.getQueryBuilderList(), shouldQuery.getQueryBuilderList(), mustNotQuery.getQueryBuilderList(), filterQuery.getQueryBuilderList()); if (opLambda != null) { opLambda.callback(builder); } diff --git a/src/main/java/org/codelibs/fess/es/config/cbean/cq/bs/BsWebConfigToRoleCQ.java b/src/main/java/org/codelibs/fess/es/config/cbean/cq/bs/BsWebConfigToRoleCQ.java index 3605e776f..51535edf0 100644 --- a/src/main/java/org/codelibs/fess/es/config/cbean/cq/bs/BsWebConfigToRoleCQ.java +++ b/src/main/java/org/codelibs/fess/es/config/cbean/cq/bs/BsWebConfigToRoleCQ.java @@ -15,7 +15,7 @@ */ package org.codelibs.fess.es.config.cbean.cq.bs; -import java.time.LocalDateTime; +import java.time.*; import java.util.Collection; import org.codelibs.fess.es.config.allcommon.EsAbstractConditionQuery; @@ -33,6 +33,7 @@ import org.elasticsearch.index.query.RangeQueryBuilder; import org.elasticsearch.index.query.TermQueryBuilder; import org.elasticsearch.index.query.TermsQueryBuilder; + /** * @author ESFlute (using FreeGen) */ @@ -60,8 +61,9 @@ public abstract class BsWebConfigToRoleCQ extends EsAbstractConditionQuery { filtered(filteredLambda, null); } - public void filtered(FilteredCall filteredLambda, ConditionOptionCall opLambda) { - bool((must, should, mustNot, filter) -> { + public void filtered(FilteredCall filteredLambda, + ConditionOptionCall opLambda) { + bool((must, should, mustNot, filter)->{ filteredLambda.callback(must, filter); }, opLambda); } @@ -96,9 +98,7 @@ public abstract class BsWebConfigToRoleCQ extends EsAbstractConditionQuery { WebConfigToRoleCQ filterQuery = new WebConfigToRoleCQ(); boolLambda.callback(mustQuery, shouldQuery, mustNotQuery, filterQuery); if (mustQuery.hasQueries() || shouldQuery.hasQueries() || mustNotQuery.hasQueries() || filterQuery.hasQueries()) { - BoolQueryBuilder builder = - regBoolCQ(mustQuery.getQueryBuilderList(), shouldQuery.getQueryBuilderList(), mustNotQuery.getQueryBuilderList(), - filterQuery.getQueryBuilderList()); + BoolQueryBuilder builder = regBoolCQ(mustQuery.getQueryBuilderList(), shouldQuery.getQueryBuilderList(), mustNotQuery.getQueryBuilderList(), filterQuery.getQueryBuilderList()); if (opLambda != null) { opLambda.callback(builder); } diff --git a/src/main/java/org/codelibs/fess/es/config/exbhv/CrawlingSessionBhv.java b/src/main/java/org/codelibs/fess/es/config/exbhv/CrawlingInfoBhv.java similarity index 84% rename from src/main/java/org/codelibs/fess/es/config/exbhv/CrawlingSessionBhv.java rename to src/main/java/org/codelibs/fess/es/config/exbhv/CrawlingInfoBhv.java index 773276508..f765281cc 100644 --- a/src/main/java/org/codelibs/fess/es/config/exbhv/CrawlingSessionBhv.java +++ b/src/main/java/org/codelibs/fess/es/config/exbhv/CrawlingInfoBhv.java @@ -15,11 +15,11 @@ */ package org.codelibs.fess.es.config.exbhv; -import org.codelibs.fess.es.config.bsbhv.BsCrawlingSessionBhv; +import org.codelibs.fess.es.config.bsbhv.BsCrawlingInfoBhv; /** * @author FreeGen */ -public class CrawlingSessionBhv extends BsCrawlingSessionBhv { +public class CrawlingInfoBhv extends BsCrawlingInfoBhv { } diff --git a/src/main/java/org/codelibs/fess/es/config/exbhv/CrawlingSessionInfoBhv.java b/src/main/java/org/codelibs/fess/es/config/exbhv/CrawlingInfoParamBhv.java similarity index 83% rename from src/main/java/org/codelibs/fess/es/config/exbhv/CrawlingSessionInfoBhv.java rename to src/main/java/org/codelibs/fess/es/config/exbhv/CrawlingInfoParamBhv.java index 92c52ce51..501d566a1 100644 --- a/src/main/java/org/codelibs/fess/es/config/exbhv/CrawlingSessionInfoBhv.java +++ b/src/main/java/org/codelibs/fess/es/config/exbhv/CrawlingInfoParamBhv.java @@ -15,11 +15,11 @@ */ package org.codelibs.fess.es.config.exbhv; -import org.codelibs.fess.es.config.bsbhv.BsCrawlingSessionInfoBhv; +import org.codelibs.fess.es.config.bsbhv.BsCrawlingInfoParamBhv; /** * @author FreeGen */ -public class CrawlingSessionInfoBhv extends BsCrawlingSessionInfoBhv { +public class CrawlingInfoParamBhv extends BsCrawlingInfoParamBhv { } diff --git a/src/main/java/org/codelibs/fess/es/config/exentity/CrawlingSession.java b/src/main/java/org/codelibs/fess/es/config/exentity/CrawlingInfo.java similarity index 67% rename from src/main/java/org/codelibs/fess/es/config/exentity/CrawlingSession.java rename to src/main/java/org/codelibs/fess/es/config/exentity/CrawlingInfo.java index 17352b1d2..5ed25af62 100644 --- a/src/main/java/org/codelibs/fess/es/config/exentity/CrawlingSession.java +++ b/src/main/java/org/codelibs/fess/es/config/exentity/CrawlingInfo.java @@ -17,21 +17,21 @@ package org.codelibs.fess.es.config.exentity; import java.util.List; -import org.codelibs.fess.es.config.bsentity.BsCrawlingSession; +import org.codelibs.fess.es.config.bsentity.BsCrawlingInfo; /** - * @author FreeGen + * @author ESFlute (using FreeGen) */ -public class CrawlingSession extends BsCrawlingSession { +public class CrawlingInfo extends BsCrawlingInfo { private static final long serialVersionUID = 1L; - private List crawlingSessionInfoList; + private List crawlingInfoParamList; - public CrawlingSession() { + public CrawlingInfo() { } - public CrawlingSession(final String sessionId) { + public CrawlingInfo(final String sessionId) { setSessionId(sessionId); } @@ -51,11 +51,11 @@ public class CrawlingSession extends BsCrawlingSession { asDocMeta().version(version); } - public void setCrawlingSessionInfoList(final List crawlingSessionInfoList) { - this.crawlingSessionInfoList = crawlingSessionInfoList; + public void setCrawlingInfoInfoList(final List crawlingInfoParamList) { + this.crawlingInfoParamList = crawlingInfoParamList; } - public List getCrawlingSessionInfoList() { - return crawlingSessionInfoList; + public List getCrawlingInfoParamList() { + return crawlingInfoParamList; } } diff --git a/src/main/java/org/codelibs/fess/es/config/exentity/CrawlingSessionInfo.java b/src/main/java/org/codelibs/fess/es/config/exentity/CrawlingInfoParam.java similarity index 70% rename from src/main/java/org/codelibs/fess/es/config/exentity/CrawlingSessionInfo.java rename to src/main/java/org/codelibs/fess/es/config/exentity/CrawlingInfoParam.java index ddffb9805..1ce085773 100644 --- a/src/main/java/org/codelibs/fess/es/config/exentity/CrawlingSessionInfo.java +++ b/src/main/java/org/codelibs/fess/es/config/exentity/CrawlingInfoParam.java @@ -17,20 +17,20 @@ package org.codelibs.fess.es.config.exentity; import java.util.Locale; -import org.codelibs.fess.es.config.bsentity.BsCrawlingSessionInfo; -import org.codelibs.fess.es.config.exbhv.CrawlingSessionBhv; +import org.codelibs.fess.es.config.bsentity.BsCrawlingInfoParam; +import org.codelibs.fess.es.config.exbhv.CrawlingInfoBhv; import org.codelibs.fess.util.ComponentUtil; import org.dbflute.optional.OptionalEntity; import org.lastaflute.web.util.LaRequestUtil; /** - * @author FreeGen + * @author ESFlute (using FreeGen) */ -public class CrawlingSessionInfo extends BsCrawlingSessionInfo { +public class CrawlingInfoParam extends BsCrawlingInfoParam { private static final long serialVersionUID = 1L; - private OptionalEntity crawlingSession; + private OptionalEntity crawlingInfo; public String getId() { return asDocMeta().id(); @@ -48,14 +48,14 @@ public class CrawlingSessionInfo extends BsCrawlingSessionInfo { asDocMeta().version(version); } - public OptionalEntity getCrawlingSession() { - if (crawlingSession != null) { - final CrawlingSessionBhv crawlingSessionBhv = ComponentUtil.getComponent(CrawlingSessionBhv.class); - crawlingSession = crawlingSessionBhv.selectEntity(cb -> { - cb.query().docMeta().setId_Equal(getCrawlingSessionId()); + public OptionalEntity getCrawlingInfo() { + if (crawlingInfo != null) { + final CrawlingInfoBhv crawlingInfoBhv = ComponentUtil.getComponent(CrawlingInfoBhv.class); + crawlingInfo = crawlingInfoBhv.selectEntity(cb -> { + cb.query().docMeta().setId_Equal(getCrawlingInfoId()); }); } - return crawlingSession; + return crawlingInfo; } public String getKeyMsg() { diff --git a/src/main/java/org/codelibs/fess/es/log/allcommon/EsAbstractBehavior.java b/src/main/java/org/codelibs/fess/es/log/allcommon/EsAbstractBehavior.java index 18a2239b7..612521abe 100644 --- a/src/main/java/org/codelibs/fess/es/log/allcommon/EsAbstractBehavior.java +++ b/src/main/java/org/codelibs/fess/es/log/allcommon/EsAbstractBehavior.java @@ -25,8 +25,11 @@ import java.util.function.Function; import javax.annotation.Resource; +import org.codelibs.fess.es.log.allcommon.EsAbstractEntity; import org.codelibs.fess.es.log.allcommon.EsAbstractEntity.DocMeta; import org.codelibs.fess.es.log.allcommon.EsAbstractEntity.RequestOptionCall; +import org.codelibs.fess.es.log.allcommon.EsAbstractConditionBean; +import org.codelibs.fess.es.log.allcommon.EsPagingResultBean; import org.dbflute.Entity; import org.dbflute.bhv.AbstractBehaviorWritable; import org.dbflute.bhv.readable.EntityRowHandler; @@ -70,11 +73,8 @@ public abstract class EsAbstractBehavior RESULT createEntity(Map source, Class entityType); // =================================================================================== @@ -178,9 +178,8 @@ public abstract class EsAbstractBehavior handler) { - final SearchRequestBuilder builder = - client.prepareSearch(asEsIndex()).setTypes(asEsIndexType()).setSearchType(SearchType.SCAN).setScroll(scrollForCursor) - .setSize(sizeForCursor); + final SearchRequestBuilder builder = client.prepareSearch(asEsIndex()).setTypes(asEsIndexType()).setSearchType(SearchType.SCAN) + .setScroll(scrollForCursor).setSize(sizeForCursor); ((EsAbstractConditionBean) cb).request().build(builder); final SearchResponse response = ((EsAbstractConditionBean) cb).build(builder).execute().actionGet(); @@ -288,9 +287,8 @@ public abstract class EsAbstractBehavior option) { - final SearchRequestBuilder builder = - client.prepareSearch(asEsIndex()).setTypes(asEsIndexType()).setSearchType(SearchType.SCAN).setScroll(scrollForDelete) - .setSize(sizeForDelete); + final SearchRequestBuilder builder = client.prepareSearch(asEsIndex()).setTypes(asEsIndexType()).setSearchType(SearchType.SCAN) + .setScroll(scrollForDelete).setSize(sizeForDelete); ((EsAbstractConditionBean) cb).request().build(builder); final SearchResponse response = ((EsAbstractConditionBean) cb).build(builder).execute().actionGet(); @@ -389,7 +387,6 @@ public abstract class EsAbstractBehavior mustList, List shouldList, List mustNotList, - List filterList) { + protected BoolQueryBuilder regBoolCQ(List mustList, List shouldList, List mustNotList, List filterList) { assertObjectNotNull("mustList", mustList); assertObjectNotNull("shouldList", shouldList); assertObjectNotNull("mustNotList", mustNotList); @@ -273,6 +272,7 @@ public abstract class EsAbstractConditionQuery implements ConditionQuery { registerOrderBy(field, false); } + protected void registerOrderBy(String field, boolean ascOrDesc) { assertObjectNotNull("field", field); if (fieldSortBuilderList == null) { @@ -285,7 +285,7 @@ public abstract class EsAbstractConditionQuery implements ConditionQuery { // Invalid Query // ============= protected void checkEsInvalidQuery(String name, Object value) { - if (value == null || (value instanceof String && ((String) value).isEmpty())) { + if (value == null || (value instanceof String && ((String)value).isEmpty())) { String msg = "Cannot register null or empty query: name=" + name + " value=" + value; throw new InvalidQueryRegisteredException(msg); } @@ -479,3 +479,4 @@ public abstract class EsAbstractConditionQuery implements ConditionQuery { void callback(CQ and); } } + diff --git a/src/main/java/org/codelibs/fess/es/log/allcommon/EsAbstractEntity.java b/src/main/java/org/codelibs/fess/es/log/allcommon/EsAbstractEntity.java index 52a14ab94..f9fd8397a 100644 --- a/src/main/java/org/codelibs/fess/es/log/allcommon/EsAbstractEntity.java +++ b/src/main/java/org/codelibs/fess/es/log/allcommon/EsAbstractEntity.java @@ -283,3 +283,4 @@ public abstract class EsAbstractEntity implements Entity, Serializable, Cloneabl void callback(OP op); } } + diff --git a/src/main/java/org/codelibs/fess/es/log/allcommon/EsPagingResultBean.java b/src/main/java/org/codelibs/fess/es/log/allcommon/EsPagingResultBean.java index dfcd610ce..a2f2a1707 100644 --- a/src/main/java/org/codelibs/fess/es/log/allcommon/EsPagingResultBean.java +++ b/src/main/java/org/codelibs/fess/es/log/allcommon/EsPagingResultBean.java @@ -62,3 +62,4 @@ public class EsPagingResultBean extends PagingResultBean { this.failedShards = failedShards; } } + diff --git a/src/main/java/org/codelibs/fess/es/log/bsbhv/BsClickLogBhv.java b/src/main/java/org/codelibs/fess/es/log/bsbhv/BsClickLogBhv.java index 0ddc3779a..6e8a2783c 100644 --- a/src/main/java/org/codelibs/fess/es/log/bsbhv/BsClickLogBhv.java +++ b/src/main/java/org/codelibs/fess/es/log/bsbhv/BsClickLogBhv.java @@ -103,7 +103,8 @@ public abstract class BsClickLogBhv extends EsAbstractBehavior OptionalEntity doSelectOptionalEntity(ClickLogCB cb, Class tp) { + protected OptionalEntity doSelectOptionalEntity(ClickLogCB cb, + Class tp) { return createOptionalEntity(doSelectEntity(cb, tp), cb); } @@ -171,7 +172,7 @@ public abstract class BsClickLogBhv extends EsAbstractBehavior cbLambda, EntityRowHandler> entityLambda) { - delegateSelectBulk(createCB(cbLambda), entityLambda, typeOfSelectedEntity()); + delegateSelectBulk(createCB(cbLambda), entityLambda,typeOfSelectedEntity()); } // =================================================================================== @@ -251,3 +252,4 @@ public abstract class BsClickLogBhv extends EsAbstractBehavior OptionalEntity doSelectOptionalEntity(EventLogCB cb, Class tp) { + protected OptionalEntity doSelectOptionalEntity(EventLogCB cb, + Class tp) { return createOptionalEntity(doSelectEntity(cb, tp), cb); } @@ -169,7 +170,7 @@ public abstract class BsEventLogBhv extends EsAbstractBehavior cbLambda, EntityRowHandler> entityLambda) { - delegateSelectBulk(createCB(cbLambda), entityLambda, typeOfSelectedEntity()); + delegateSelectBulk(createCB(cbLambda), entityLambda,typeOfSelectedEntity()); } // =================================================================================== @@ -249,3 +250,4 @@ public abstract class BsEventLogBhv extends EsAbstractBehavior OptionalEntity doSelectOptionalEntity(FavoriteLogCB cb, Class tp) { + protected OptionalEntity doSelectOptionalEntity(FavoriteLogCB cb, + Class tp) { return createOptionalEntity(doSelectEntity(cb, tp), cb); } @@ -169,7 +170,7 @@ public abstract class BsFavoriteLogBhv extends EsAbstractBehavior cbLambda, EntityRowHandler> entityLambda) { - delegateSelectBulk(createCB(cbLambda), entityLambda, typeOfSelectedEntity()); + delegateSelectBulk(createCB(cbLambda), entityLambda,typeOfSelectedEntity()); } // =================================================================================== @@ -249,3 +250,4 @@ public abstract class BsFavoriteLogBhv extends EsAbstractBehavior OptionalEntity doSelectOptionalEntity(SearchFieldLogCB cb, Class tp) { + protected OptionalEntity doSelectOptionalEntity(SearchFieldLogCB cb, + Class tp) { return createOptionalEntity(doSelectEntity(cb, tp), cb); } @@ -167,7 +168,7 @@ public abstract class BsSearchFieldLogBhv extends EsAbstractBehavior cbLambda, EntityRowHandler> entityLambda) { - delegateSelectBulk(createCB(cbLambda), entityLambda, typeOfSelectedEntity()); + delegateSelectBulk(createCB(cbLambda), entityLambda,typeOfSelectedEntity()); } // =================================================================================== @@ -247,3 +248,4 @@ public abstract class BsSearchFieldLogBhv extends EsAbstractBehavior OptionalEntity doSelectOptionalEntity(SearchLogCB cb, Class tp) { + protected OptionalEntity doSelectOptionalEntity(SearchLogCB cb, + Class tp) { return createOptionalEntity(doSelectEntity(cb, tp), cb); } @@ -179,7 +180,7 @@ public abstract class BsSearchLogBhv extends EsAbstractBehavior cbLambda, EntityRowHandler> entityLambda) { - delegateSelectBulk(createCB(cbLambda), entityLambda, typeOfSelectedEntity()); + delegateSelectBulk(createCB(cbLambda), entityLambda,typeOfSelectedEntity()); } // =================================================================================== @@ -259,3 +260,4 @@ public abstract class BsSearchLogBhv extends EsAbstractBehavior OptionalEntity doSelectOptionalEntity(UserInfoCB cb, Class tp) { + protected OptionalEntity doSelectOptionalEntity(UserInfoCB cb, + Class tp) { return createOptionalEntity(doSelectEntity(cb, tp), cb); } @@ -166,7 +167,7 @@ public abstract class BsUserInfoBhv extends EsAbstractBehavior cbLambda, EntityRowHandler> entityLambda) { - delegateSelectBulk(createCB(cbLambda), entityLambda, typeOfSelectedEntity()); + delegateSelectBulk(createCB(cbLambda), entityLambda,typeOfSelectedEntity()); } // =================================================================================== @@ -246,3 +247,4 @@ public abstract class BsUserInfoBhv extends EsAbstractBehavior _epgMap = newHashMap(); { - setupEpg(_epgMap, et -> ((ClickLog) et).getQueryRequestedAt(), - (et, vl) -> ((ClickLog) et).setQueryRequestedAt(DfTypeUtil.toLocalDateTime(vl)), "queryRequestedAt"); - setupEpg(_epgMap, et -> ((ClickLog) et).getRequestedAt(), - (et, vl) -> ((ClickLog) et).setRequestedAt(DfTypeUtil.toLocalDateTime(vl)), "requestedAt"); - setupEpg(_epgMap, et -> ((ClickLog) et).getQueryId(), (et, vl) -> ((ClickLog) et).setQueryId(DfTypeUtil.toString(vl)), "queryId"); - setupEpg(_epgMap, et -> ((ClickLog) et).getDocId(), (et, vl) -> ((ClickLog) et).setDocId(DfTypeUtil.toString(vl)), "docId"); - setupEpg(_epgMap, et -> ((ClickLog) et).getUserSessionId(), (et, vl) -> ((ClickLog) et).setUserSessionId(DfTypeUtil.toString(vl)), - "userSessionId"); - setupEpg(_epgMap, et -> ((ClickLog) et).getUrl(), (et, vl) -> ((ClickLog) et).setUrl(DfTypeUtil.toString(vl)), "url"); - setupEpg(_epgMap, et -> ((ClickLog) et).getOrder(), (et, vl) -> ((ClickLog) et).setOrder(DfTypeUtil.toInteger(vl)), "order"); + setupEpg(_epgMap, et-> ((ClickLog)et).getQueryRequestedAt(),(et,vl)->((ClickLog) et).setQueryRequestedAt(DfTypeUtil.toLocalDateTime(vl)), "queryRequestedAt"); + setupEpg(_epgMap, et-> ((ClickLog)et).getRequestedAt(),(et,vl)->((ClickLog) et).setRequestedAt(DfTypeUtil.toLocalDateTime(vl)), "requestedAt"); + setupEpg(_epgMap, et-> ((ClickLog)et).getQueryId(),(et,vl)->((ClickLog) et).setQueryId(DfTypeUtil.toString(vl)), "queryId"); + setupEpg(_epgMap, et-> ((ClickLog)et).getDocId(),(et,vl)->((ClickLog) et).setDocId(DfTypeUtil.toString(vl)), "docId"); + setupEpg(_epgMap, et-> ((ClickLog)et).getUserSessionId(),(et,vl)->((ClickLog) et).setUserSessionId(DfTypeUtil.toString(vl)), "userSessionId"); + setupEpg(_epgMap, et-> ((ClickLog)et).getUrl(),(et,vl)->((ClickLog) et).setUrl(DfTypeUtil.toString(vl)), "url"); + setupEpg(_epgMap, et-> ((ClickLog)et).getOrder(),(et,vl)->((ClickLog) et).setOrder(DfTypeUtil.toInteger(vl)), "order"); } @Override @@ -102,71 +100,32 @@ public class ClickLogDbm extends AbstractDBMeta { protected final String _tableDbName = "click_log"; protected final String _tableDispName = "click_log"; protected final String _tablePropertyName = "ClickLog"; - - public String getTableDbName() { - return _tableDbName; - } - + public String getTableDbName() { return _tableDbName; } @Override - public String getTableDispName() { - return _tableDispName; - } - + public String getTableDispName() { return _tableDispName; } @Override - public String getTablePropertyName() { - return _tablePropertyName; - } - + public String getTablePropertyName() { return _tablePropertyName; } @Override - public TableSqlName getTableSqlName() { - return null; - } + public TableSqlName getTableSqlName() { return null; } // =================================================================================== // Column Info // =========== - protected final ColumnInfo _columnQueryRequestedAt = cci("queryRequestedAt", "queryRequestedAt", null, null, LocalDateTime.class, - "queryRequestedAt", null, false, false, false, "LocalDateTime", 0, 0, null, false, null, null, null, null, null, false); - protected final ColumnInfo _columnRequestedAt = cci("requestedAt", "requestedAt", null, null, LocalDateTime.class, "requestedAt", null, - false, false, false, "LocalDateTime", 0, 0, null, false, null, null, null, null, null, false); - protected final ColumnInfo _columnQueryId = cci("queryId", "queryId", null, null, String.class, "queryId", null, false, false, false, - "String", 0, 0, null, false, null, null, null, null, null, false); - protected final ColumnInfo _columnDocId = cci("docId", "docId", null, null, String.class, "docId", null, false, false, false, "String", - 0, 0, null, false, null, null, null, null, null, false); - protected final ColumnInfo _columnUserSessionId = cci("userSessionId", "userSessionId", null, null, String.class, "userSessionId", - null, false, false, false, "String", 0, 0, null, false, null, null, null, null, null, false); - protected final ColumnInfo _columnUrl = cci("url", "url", null, null, String.class, "url", null, false, false, false, "String", 0, 0, - null, false, null, null, null, null, null, false); - protected final ColumnInfo _columnOrder = cci("order", "order", null, null, Integer.class, "order", null, false, false, false, - "Integer", 0, 0, null, false, null, null, null, null, null, false); + protected final ColumnInfo _columnQueryRequestedAt = cci("queryRequestedAt", "queryRequestedAt", null, null, LocalDateTime.class, "queryRequestedAt", null, false, false, false, "LocalDateTime", 0, 0, null, false, null, null, null, null, null, false); + protected final ColumnInfo _columnRequestedAt = cci("requestedAt", "requestedAt", null, null, LocalDateTime.class, "requestedAt", null, false, false, false, "LocalDateTime", 0, 0, null, false, null, null, null, null, null, false); + protected final ColumnInfo _columnQueryId = cci("queryId", "queryId", null, null, String.class, "queryId", null, false, false, false, "String", 0, 0, null, false, null, null, null, null, null, false); + protected final ColumnInfo _columnDocId = cci("docId", "docId", null, null, String.class, "docId", null, false, false, false, "String", 0, 0, null, false, null, null, null, null, null, false); + protected final ColumnInfo _columnUserSessionId = cci("userSessionId", "userSessionId", null, null, String.class, "userSessionId", null, false, false, false, "String", 0, 0, null, false, null, null, null, null, null, false); + protected final ColumnInfo _columnUrl = cci("url", "url", null, null, String.class, "url", null, false, false, false, "String", 0, 0, null, false, null, null, null, null, null, false); + protected final ColumnInfo _columnOrder = cci("order", "order", null, null, Integer.class, "order", null, false, false, false, "Integer", 0, 0, null, false, null, null, null, null, null, false); - public ColumnInfo columnQueryRequestedAt() { - return _columnQueryRequestedAt; - } - - public ColumnInfo columnRequestedAt() { - return _columnRequestedAt; - } - - public ColumnInfo columnQueryId() { - return _columnQueryId; - } - - public ColumnInfo columnDocId() { - return _columnDocId; - } - - public ColumnInfo columnUserSessionId() { - return _columnUserSessionId; - } - - public ColumnInfo columnUrl() { - return _columnUrl; - } - - public ColumnInfo columnOrder() { - return _columnOrder; - } + public ColumnInfo columnQueryRequestedAt() { return _columnQueryRequestedAt; } + public ColumnInfo columnRequestedAt() { return _columnRequestedAt; } + public ColumnInfo columnQueryId() { return _columnQueryId; } + public ColumnInfo columnDocId() { return _columnDocId; } + public ColumnInfo columnUserSessionId() { return _columnUserSessionId; } + public ColumnInfo columnUrl() { return _columnUrl; } + public ColumnInfo columnOrder() { return _columnOrder; } protected List ccil() { List ls = newArrayList(); @@ -253,3 +212,4 @@ public class ClickLogDbm extends AbstractDBMeta { return null; } } + diff --git a/src/main/java/org/codelibs/fess/es/log/bsentity/dbmeta/EventLogDbm.java b/src/main/java/org/codelibs/fess/es/log/bsentity/dbmeta/EventLogDbm.java index 73e0e724e..a8b16ab54 100644 --- a/src/main/java/org/codelibs/fess/es/log/bsentity/dbmeta/EventLogDbm.java +++ b/src/main/java/org/codelibs/fess/es/log/bsentity/dbmeta/EventLogDbm.java @@ -15,11 +15,12 @@ */ package org.codelibs.fess.es.log.bsentity.dbmeta; -import java.time.LocalDateTime; +import java.time.*; import java.util.List; import java.util.Map; import org.codelibs.fess.es.log.exentity.EventLog; + import org.dbflute.Entity; import org.dbflute.dbmeta.AbstractDBMeta; import org.dbflute.dbmeta.info.ColumnInfo; @@ -79,14 +80,11 @@ public class EventLogDbm extends AbstractDBMeta { // --------------- protected final Map _epgMap = newHashMap(); { - setupEpg(_epgMap, et -> ((EventLog) et).getCreatedAt(), (et, vl) -> ((EventLog) et).setCreatedAt(DfTypeUtil.toLocalDateTime(vl)), - "createdAt"); - setupEpg(_epgMap, et -> ((EventLog) et).getCreatedBy(), (et, vl) -> ((EventLog) et).setCreatedBy(DfTypeUtil.toString(vl)), - "createdBy"); - setupEpg(_epgMap, et -> ((EventLog) et).getEventType(), (et, vl) -> ((EventLog) et).setEventType(DfTypeUtil.toString(vl)), - "eventType"); - setupEpg(_epgMap, et -> ((EventLog) et).getMessage(), (et, vl) -> ((EventLog) et).setMessage(DfTypeUtil.toString(vl)), "message"); - setupEpg(_epgMap, et -> ((EventLog) et).getPath(), (et, vl) -> ((EventLog) et).setPath(DfTypeUtil.toString(vl)), "path"); + setupEpg(_epgMap, et-> ((EventLog)et).getCreatedAt(),(et,vl)->((EventLog) et).setCreatedAt(DfTypeUtil.toLocalDateTime(vl)), "createdAt"); + setupEpg(_epgMap, et-> ((EventLog)et).getCreatedBy(),(et,vl)->((EventLog) et).setCreatedBy(DfTypeUtil.toString(vl)), "createdBy"); + setupEpg(_epgMap, et-> ((EventLog)et).getEventType(),(et,vl)->((EventLog) et).setEventType(DfTypeUtil.toString(vl)), "eventType"); + setupEpg(_epgMap, et-> ((EventLog)et).getMessage(),(et,vl)->((EventLog) et).setMessage(DfTypeUtil.toString(vl)), "message"); + setupEpg(_epgMap, et-> ((EventLog)et).getPath(),(et,vl)->((EventLog) et).setPath(DfTypeUtil.toString(vl)), "path"); } @Override @@ -100,59 +98,28 @@ public class EventLogDbm extends AbstractDBMeta { protected final String _tableDbName = "event_log"; protected final String _tableDispName = "event_log"; protected final String _tablePropertyName = "EventLog"; - - public String getTableDbName() { - return _tableDbName; - } - + public String getTableDbName() { return _tableDbName; } @Override - public String getTableDispName() { - return _tableDispName; - } - + public String getTableDispName() { return _tableDispName; } @Override - public String getTablePropertyName() { - return _tablePropertyName; - } - + public String getTablePropertyName() { return _tablePropertyName; } @Override - public TableSqlName getTableSqlName() { - return null; - } + public TableSqlName getTableSqlName() { return null; } // =================================================================================== // Column Info // =========== - protected final ColumnInfo _columnCreatedAt = cci("createdAt", "createdAt", null, null, LocalDateTime.class, "createdAt", null, false, - false, false, "LocalDateTime", 0, 0, null, false, null, null, null, null, null, false); - protected final ColumnInfo _columnCreatedBy = cci("createdBy", "createdBy", null, null, String.class, "createdBy", null, false, false, - false, "String", 0, 0, null, false, null, null, null, null, null, false); - protected final ColumnInfo _columnEventType = cci("eventType", "eventType", null, null, String.class, "eventType", null, false, false, - false, "String", 0, 0, null, false, null, null, null, null, null, false); - protected final ColumnInfo _columnMessage = cci("message", "message", null, null, String.class, "message", null, false, false, false, - "String", 0, 0, null, false, null, null, null, null, null, false); - protected final ColumnInfo _columnPath = cci("path", "path", null, null, String.class, "path", null, false, false, false, "String", 0, - 0, null, false, null, null, null, null, null, false); + protected final ColumnInfo _columnCreatedAt = cci("createdAt", "createdAt", null, null, LocalDateTime.class, "createdAt", null, false, false, false, "LocalDateTime", 0, 0, null, false, null, null, null, null, null, false); + protected final ColumnInfo _columnCreatedBy = cci("createdBy", "createdBy", null, null, String.class, "createdBy", null, false, false, false, "String", 0, 0, null, false, null, null, null, null, null, false); + protected final ColumnInfo _columnEventType = cci("eventType", "eventType", null, null, String.class, "eventType", null, false, false, false, "String", 0, 0, null, false, null, null, null, null, null, false); + protected final ColumnInfo _columnMessage = cci("message", "message", null, null, String.class, "message", null, false, false, false, "String", 0, 0, null, false, null, null, null, null, null, false); + protected final ColumnInfo _columnPath = cci("path", "path", null, null, String.class, "path", null, false, false, false, "String", 0, 0, null, false, null, null, null, null, null, false); - public ColumnInfo columnCreatedAt() { - return _columnCreatedAt; - } - - public ColumnInfo columnCreatedBy() { - return _columnCreatedBy; - } - - public ColumnInfo columnEventType() { - return _columnEventType; - } - - public ColumnInfo columnMessage() { - return _columnMessage; - } - - public ColumnInfo columnPath() { - return _columnPath; - } + public ColumnInfo columnCreatedAt() { return _columnCreatedAt; } + public ColumnInfo columnCreatedBy() { return _columnCreatedBy; } + public ColumnInfo columnEventType() { return _columnEventType; } + public ColumnInfo columnMessage() { return _columnMessage; } + public ColumnInfo columnPath() { return _columnPath; } protected List ccil() { List ls = newArrayList(); @@ -237,3 +204,4 @@ public class EventLogDbm extends AbstractDBMeta { return null; } } + diff --git a/src/main/java/org/codelibs/fess/es/log/bsentity/dbmeta/FavoriteLogDbm.java b/src/main/java/org/codelibs/fess/es/log/bsentity/dbmeta/FavoriteLogDbm.java index 81fc08fb8..f6e63e917 100644 --- a/src/main/java/org/codelibs/fess/es/log/bsentity/dbmeta/FavoriteLogDbm.java +++ b/src/main/java/org/codelibs/fess/es/log/bsentity/dbmeta/FavoriteLogDbm.java @@ -15,11 +15,12 @@ */ package org.codelibs.fess.es.log.bsentity.dbmeta; -import java.time.LocalDateTime; +import java.time.*; import java.util.List; import java.util.Map; import org.codelibs.fess.es.log.exentity.FavoriteLog; + import org.dbflute.Entity; import org.dbflute.dbmeta.AbstractDBMeta; import org.dbflute.dbmeta.info.ColumnInfo; @@ -79,14 +80,11 @@ public class FavoriteLogDbm extends AbstractDBMeta { // --------------- protected final Map _epgMap = newHashMap(); { - setupEpg(_epgMap, et -> ((FavoriteLog) et).getCreatedAt(), - (et, vl) -> ((FavoriteLog) et).setCreatedAt(DfTypeUtil.toLocalDateTime(vl)), "createdAt"); - setupEpg(_epgMap, et -> ((FavoriteLog) et).getUrl(), (et, vl) -> ((FavoriteLog) et).setUrl(DfTypeUtil.toString(vl)), "url"); - setupEpg(_epgMap, et -> ((FavoriteLog) et).getDocId(), (et, vl) -> ((FavoriteLog) et).setDocId(DfTypeUtil.toString(vl)), "docId"); - setupEpg(_epgMap, et -> ((FavoriteLog) et).getQueryId(), (et, vl) -> ((FavoriteLog) et).setQueryId(DfTypeUtil.toString(vl)), - "queryId"); - setupEpg(_epgMap, et -> ((FavoriteLog) et).getUserInfoId(), (et, vl) -> ((FavoriteLog) et).setUserInfoId(DfTypeUtil.toString(vl)), - "userInfoId"); + setupEpg(_epgMap, et-> ((FavoriteLog)et).getCreatedAt(),(et,vl)->((FavoriteLog) et).setCreatedAt(DfTypeUtil.toLocalDateTime(vl)), "createdAt"); + setupEpg(_epgMap, et-> ((FavoriteLog)et).getUrl(),(et,vl)->((FavoriteLog) et).setUrl(DfTypeUtil.toString(vl)), "url"); + setupEpg(_epgMap, et-> ((FavoriteLog)et).getDocId(),(et,vl)->((FavoriteLog) et).setDocId(DfTypeUtil.toString(vl)), "docId"); + setupEpg(_epgMap, et-> ((FavoriteLog)et).getQueryId(),(et,vl)->((FavoriteLog) et).setQueryId(DfTypeUtil.toString(vl)), "queryId"); + setupEpg(_epgMap, et-> ((FavoriteLog)et).getUserInfoId(),(et,vl)->((FavoriteLog) et).setUserInfoId(DfTypeUtil.toString(vl)), "userInfoId"); } @Override @@ -100,59 +98,28 @@ public class FavoriteLogDbm extends AbstractDBMeta { protected final String _tableDbName = "favorite_log"; protected final String _tableDispName = "favorite_log"; protected final String _tablePropertyName = "FavoriteLog"; - - public String getTableDbName() { - return _tableDbName; - } - + public String getTableDbName() { return _tableDbName; } @Override - public String getTableDispName() { - return _tableDispName; - } - + public String getTableDispName() { return _tableDispName; } @Override - public String getTablePropertyName() { - return _tablePropertyName; - } - + public String getTablePropertyName() { return _tablePropertyName; } @Override - public TableSqlName getTableSqlName() { - return null; - } + public TableSqlName getTableSqlName() { return null; } // =================================================================================== // Column Info // =========== - protected final ColumnInfo _columnCreatedAt = cci("createdAt", "createdAt", null, null, LocalDateTime.class, "createdAt", null, false, - false, false, "LocalDateTime", 0, 0, null, false, null, null, null, null, null, false); - protected final ColumnInfo _columnUrl = cci("url", "url", null, null, String.class, "url", null, false, false, false, "String", 0, 0, - null, false, null, null, null, null, null, false); - protected final ColumnInfo _columnDocId = cci("docId", "docId", null, null, String.class, "docId", null, false, false, false, "String", - 0, 0, null, false, null, null, null, null, null, false); - protected final ColumnInfo _columnQueryId = cci("queryId", "queryId", null, null, String.class, "queryId", null, false, false, false, - "String", 0, 0, null, false, null, null, null, null, null, false); - protected final ColumnInfo _columnUserInfoId = cci("userInfoId", "userInfoId", null, null, String.class, "userInfoId", null, false, - false, false, "String", 0, 0, null, false, null, null, null, null, null, false); + protected final ColumnInfo _columnCreatedAt = cci("createdAt", "createdAt", null, null, LocalDateTime.class, "createdAt", null, false, false, false, "LocalDateTime", 0, 0, null, false, null, null, null, null, null, false); + protected final ColumnInfo _columnUrl = cci("url", "url", null, null, String.class, "url", null, false, false, false, "String", 0, 0, null, false, null, null, null, null, null, false); + protected final ColumnInfo _columnDocId = cci("docId", "docId", null, null, String.class, "docId", null, false, false, false, "String", 0, 0, null, false, null, null, null, null, null, false); + protected final ColumnInfo _columnQueryId = cci("queryId", "queryId", null, null, String.class, "queryId", null, false, false, false, "String", 0, 0, null, false, null, null, null, null, null, false); + protected final ColumnInfo _columnUserInfoId = cci("userInfoId", "userInfoId", null, null, String.class, "userInfoId", null, false, false, false, "String", 0, 0, null, false, null, null, null, null, null, false); - public ColumnInfo columnCreatedAt() { - return _columnCreatedAt; - } - - public ColumnInfo columnUrl() { - return _columnUrl; - } - - public ColumnInfo columnDocId() { - return _columnDocId; - } - - public ColumnInfo columnQueryId() { - return _columnQueryId; - } - - public ColumnInfo columnUserInfoId() { - return _columnUserInfoId; - } + public ColumnInfo columnCreatedAt() { return _columnCreatedAt; } + public ColumnInfo columnUrl() { return _columnUrl; } + public ColumnInfo columnDocId() { return _columnDocId; } + public ColumnInfo columnQueryId() { return _columnQueryId; } + public ColumnInfo columnUserInfoId() { return _columnUserInfoId; } protected List ccil() { List ls = newArrayList(); @@ -237,3 +204,4 @@ public class FavoriteLogDbm extends AbstractDBMeta { return null; } } + diff --git a/src/main/java/org/codelibs/fess/es/log/bsentity/dbmeta/SearchFieldLogDbm.java b/src/main/java/org/codelibs/fess/es/log/bsentity/dbmeta/SearchFieldLogDbm.java index 581a24cf9..227e59f64 100644 --- a/src/main/java/org/codelibs/fess/es/log/bsentity/dbmeta/SearchFieldLogDbm.java +++ b/src/main/java/org/codelibs/fess/es/log/bsentity/dbmeta/SearchFieldLogDbm.java @@ -15,11 +15,12 @@ */ package org.codelibs.fess.es.log.bsentity.dbmeta; -import java.time.LocalDateTime; +import java.time.*; import java.util.List; import java.util.Map; import org.codelibs.fess.es.log.exentity.SearchFieldLog; + import org.dbflute.Entity; import org.dbflute.dbmeta.AbstractDBMeta; import org.dbflute.dbmeta.info.ColumnInfo; @@ -79,11 +80,9 @@ public class SearchFieldLogDbm extends AbstractDBMeta { // --------------- protected final Map _epgMap = newHashMap(); { - setupEpg(_epgMap, et -> ((SearchFieldLog) et).getName(), (et, vl) -> ((SearchFieldLog) et).setName(DfTypeUtil.toString(vl)), "name"); - setupEpg(_epgMap, et -> ((SearchFieldLog) et).getSearchLogId(), - (et, vl) -> ((SearchFieldLog) et).setSearchLogId(DfTypeUtil.toString(vl)), "searchLogId"); - setupEpg(_epgMap, et -> ((SearchFieldLog) et).getValue(), (et, vl) -> ((SearchFieldLog) et).setValue(DfTypeUtil.toString(vl)), - "value"); + setupEpg(_epgMap, et-> ((SearchFieldLog)et).getName(),(et,vl)->((SearchFieldLog) et).setName(DfTypeUtil.toString(vl)), "name"); + setupEpg(_epgMap, et-> ((SearchFieldLog)et).getSearchLogId(),(et,vl)->((SearchFieldLog) et).setSearchLogId(DfTypeUtil.toString(vl)), "searchLogId"); + setupEpg(_epgMap, et-> ((SearchFieldLog)et).getValue(),(et,vl)->((SearchFieldLog) et).setValue(DfTypeUtil.toString(vl)), "value"); } @Override @@ -97,47 +96,24 @@ public class SearchFieldLogDbm extends AbstractDBMeta { protected final String _tableDbName = "search_field_log"; protected final String _tableDispName = "search_field_log"; protected final String _tablePropertyName = "SearchFieldLog"; - - public String getTableDbName() { - return _tableDbName; - } - + public String getTableDbName() { return _tableDbName; } @Override - public String getTableDispName() { - return _tableDispName; - } - + public String getTableDispName() { return _tableDispName; } @Override - public String getTablePropertyName() { - return _tablePropertyName; - } - + public String getTablePropertyName() { return _tablePropertyName; } @Override - public TableSqlName getTableSqlName() { - return null; - } + public TableSqlName getTableSqlName() { return null; } // =================================================================================== // Column Info // =========== - protected final ColumnInfo _columnName = cci("name", "name", null, null, String.class, "name", null, false, false, false, "String", 0, - 0, null, false, null, null, null, null, null, false); - protected final ColumnInfo _columnSearchLogId = cci("searchLogId", "searchLogId", null, null, String.class, "searchLogId", null, false, - false, false, "String", 0, 0, null, false, null, null, null, null, null, false); - protected final ColumnInfo _columnValue = cci("value", "value", null, null, String.class, "value", null, false, false, false, "String", - 0, 0, null, false, null, null, null, null, null, false); + protected final ColumnInfo _columnName = cci("name", "name", null, null, String.class, "name", null, false, false, false, "String", 0, 0, null, false, null, null, null, null, null, false); + protected final ColumnInfo _columnSearchLogId = cci("searchLogId", "searchLogId", null, null, String.class, "searchLogId", null, false, false, false, "String", 0, 0, null, false, null, null, null, null, null, false); + protected final ColumnInfo _columnValue = cci("value", "value", null, null, String.class, "value", null, false, false, false, "String", 0, 0, null, false, null, null, null, null, null, false); - public ColumnInfo columnName() { - return _columnName; - } - - public ColumnInfo columnSearchLogId() { - return _columnSearchLogId; - } - - public ColumnInfo columnValue() { - return _columnValue; - } + public ColumnInfo columnName() { return _columnName; } + public ColumnInfo columnSearchLogId() { return _columnSearchLogId; } + public ColumnInfo columnValue() { return _columnValue; } protected List ccil() { List ls = newArrayList(); @@ -220,3 +196,4 @@ public class SearchFieldLogDbm extends AbstractDBMeta { return null; } } + diff --git a/src/main/java/org/codelibs/fess/es/log/bsentity/dbmeta/SearchLogDbm.java b/src/main/java/org/codelibs/fess/es/log/bsentity/dbmeta/SearchLogDbm.java index 900290b67..61b9a861d 100644 --- a/src/main/java/org/codelibs/fess/es/log/bsentity/dbmeta/SearchLogDbm.java +++ b/src/main/java/org/codelibs/fess/es/log/bsentity/dbmeta/SearchLogDbm.java @@ -15,11 +15,12 @@ */ package org.codelibs.fess.es.log.bsentity.dbmeta; -import java.time.LocalDateTime; +import java.time.*; import java.util.List; import java.util.Map; import org.codelibs.fess.es.log.exentity.SearchLog; + import org.dbflute.Entity; import org.dbflute.dbmeta.AbstractDBMeta; import org.dbflute.dbmeta.info.ColumnInfo; @@ -79,32 +80,21 @@ public class SearchLogDbm extends AbstractDBMeta { // --------------- protected final Map _epgMap = newHashMap(); { - setupEpg(_epgMap, et -> ((SearchLog) et).getAccessType(), (et, vl) -> ((SearchLog) et).setAccessType(DfTypeUtil.toString(vl)), - "accessType"); - setupEpg(_epgMap, et -> ((SearchLog) et).getUser(), (et, vl) -> ((SearchLog) et).setUser(DfTypeUtil.toString(vl)), "user"); - setupEpg(_epgMap, et -> ((SearchLog) et).getQueryId(), (et, vl) -> ((SearchLog) et).setQueryId(DfTypeUtil.toString(vl)), "queryId"); - setupEpg(_epgMap, et -> ((SearchLog) et).getClientIp(), (et, vl) -> ((SearchLog) et).setClientIp(DfTypeUtil.toString(vl)), - "clientIp"); - setupEpg(_epgMap, et -> ((SearchLog) et).getHitCount(), (et, vl) -> ((SearchLog) et).setHitCount(DfTypeUtil.toLong(vl)), "hitCount"); - setupEpg(_epgMap, et -> ((SearchLog) et).getQueryOffset(), (et, vl) -> ((SearchLog) et).setQueryOffset(DfTypeUtil.toInteger(vl)), - "queryOffset"); - setupEpg(_epgMap, et -> ((SearchLog) et).getQueryPageSize(), - (et, vl) -> ((SearchLog) et).setQueryPageSize(DfTypeUtil.toInteger(vl)), "queryPageSize"); - setupEpg(_epgMap, et -> ((SearchLog) et).getReferer(), (et, vl) -> ((SearchLog) et).setReferer(DfTypeUtil.toString(vl)), "referer"); - setupEpg(_epgMap, et -> ((SearchLog) et).getRequestedAt(), - (et, vl) -> ((SearchLog) et).setRequestedAt(DfTypeUtil.toLocalDateTime(vl)), "requestedAt"); - setupEpg(_epgMap, et -> ((SearchLog) et).getResponseTime(), (et, vl) -> ((SearchLog) et).setResponseTime(DfTypeUtil.toLong(vl)), - "responseTime"); - setupEpg(_epgMap, et -> ((SearchLog) et).getQueryTime(), (et, vl) -> ((SearchLog) et).setQueryTime(DfTypeUtil.toLong(vl)), - "queryTime"); - setupEpg(_epgMap, et -> ((SearchLog) et).getSearchWord(), (et, vl) -> ((SearchLog) et).setSearchWord(DfTypeUtil.toString(vl)), - "searchWord"); - setupEpg(_epgMap, et -> ((SearchLog) et).getUserAgent(), (et, vl) -> ((SearchLog) et).setUserAgent(DfTypeUtil.toString(vl)), - "userAgent"); - setupEpg(_epgMap, et -> ((SearchLog) et).getUserInfoId(), (et, vl) -> ((SearchLog) et).setUserInfoId(DfTypeUtil.toString(vl)), - "userInfoId"); - setupEpg(_epgMap, et -> ((SearchLog) et).getUserSessionId(), - (et, vl) -> ((SearchLog) et).setUserSessionId(DfTypeUtil.toString(vl)), "userSessionId"); + setupEpg(_epgMap, et-> ((SearchLog)et).getAccessType(),(et,vl)->((SearchLog) et).setAccessType(DfTypeUtil.toString(vl)), "accessType"); + setupEpg(_epgMap, et-> ((SearchLog)et).getUser(),(et,vl)->((SearchLog) et).setUser(DfTypeUtil.toString(vl)), "user"); + setupEpg(_epgMap, et-> ((SearchLog)et).getQueryId(),(et,vl)->((SearchLog) et).setQueryId(DfTypeUtil.toString(vl)), "queryId"); + setupEpg(_epgMap, et-> ((SearchLog)et).getClientIp(),(et,vl)->((SearchLog) et).setClientIp(DfTypeUtil.toString(vl)), "clientIp"); + setupEpg(_epgMap, et-> ((SearchLog)et).getHitCount(),(et,vl)->((SearchLog) et).setHitCount(DfTypeUtil.toLong(vl)), "hitCount"); + setupEpg(_epgMap, et-> ((SearchLog)et).getQueryOffset(),(et,vl)->((SearchLog) et).setQueryOffset(DfTypeUtil.toInteger(vl)), "queryOffset"); + setupEpg(_epgMap, et-> ((SearchLog)et).getQueryPageSize(),(et,vl)->((SearchLog) et).setQueryPageSize(DfTypeUtil.toInteger(vl)), "queryPageSize"); + setupEpg(_epgMap, et-> ((SearchLog)et).getReferer(),(et,vl)->((SearchLog) et).setReferer(DfTypeUtil.toString(vl)), "referer"); + setupEpg(_epgMap, et-> ((SearchLog)et).getRequestedAt(),(et,vl)->((SearchLog) et).setRequestedAt(DfTypeUtil.toLocalDateTime(vl)), "requestedAt"); + setupEpg(_epgMap, et-> ((SearchLog)et).getResponseTime(),(et,vl)->((SearchLog) et).setResponseTime(DfTypeUtil.toLong(vl)), "responseTime"); + setupEpg(_epgMap, et-> ((SearchLog)et).getQueryTime(),(et,vl)->((SearchLog) et).setQueryTime(DfTypeUtil.toLong(vl)), "queryTime"); + setupEpg(_epgMap, et-> ((SearchLog)et).getSearchWord(),(et,vl)->((SearchLog) et).setSearchWord(DfTypeUtil.toString(vl)), "searchWord"); + setupEpg(_epgMap, et-> ((SearchLog)et).getUserAgent(),(et,vl)->((SearchLog) et).setUserAgent(DfTypeUtil.toString(vl)), "userAgent"); + setupEpg(_epgMap, et-> ((SearchLog)et).getUserInfoId(),(et,vl)->((SearchLog) et).setUserInfoId(DfTypeUtil.toString(vl)), "userInfoId"); + setupEpg(_epgMap, et-> ((SearchLog)et).getUserSessionId(),(et,vl)->((SearchLog) et).setUserSessionId(DfTypeUtil.toString(vl)), "userSessionId"); } @Override @@ -118,119 +108,48 @@ public class SearchLogDbm extends AbstractDBMeta { protected final String _tableDbName = "search_log"; protected final String _tableDispName = "search_log"; protected final String _tablePropertyName = "SearchLog"; - - public String getTableDbName() { - return _tableDbName; - } - + public String getTableDbName() { return _tableDbName; } @Override - public String getTableDispName() { - return _tableDispName; - } - + public String getTableDispName() { return _tableDispName; } @Override - public String getTablePropertyName() { - return _tablePropertyName; - } - + public String getTablePropertyName() { return _tablePropertyName; } @Override - public TableSqlName getTableSqlName() { - return null; - } + public TableSqlName getTableSqlName() { return null; } // =================================================================================== // Column Info // =========== - protected final ColumnInfo _columnAccessType = cci("accessType", "accessType", null, null, String.class, "accessType", null, false, - false, false, "String", 0, 0, null, false, null, null, null, null, null, false); - protected final ColumnInfo _columnUser = cci("user", "user", null, null, String.class, "user", null, false, false, false, "String", 0, - 0, null, false, null, null, null, null, null, false); - protected final ColumnInfo _columnQueryId = cci("queryId", "queryId", null, null, String.class, "queryId", null, false, false, false, - "String", 0, 0, null, false, null, null, null, null, null, false); - protected final ColumnInfo _columnClientIp = cci("clientIp", "clientIp", null, null, String.class, "clientIp", null, false, false, - false, "String", 0, 0, null, false, null, null, null, null, null, false); - protected final ColumnInfo _columnHitCount = cci("hitCount", "hitCount", null, null, Long.class, "hitCount", null, false, false, false, - "Long", 0, 0, null, false, null, null, null, null, null, false); - protected final ColumnInfo _columnQueryOffset = cci("queryOffset", "queryOffset", null, null, Integer.class, "queryOffset", null, - false, false, false, "Integer", 0, 0, null, false, null, null, null, null, null, false); - protected final ColumnInfo _columnQueryPageSize = cci("queryPageSize", "queryPageSize", null, null, Integer.class, "queryPageSize", - null, false, false, false, "Integer", 0, 0, null, false, null, null, null, null, null, false); - protected final ColumnInfo _columnReferer = cci("referer", "referer", null, null, String.class, "referer", null, false, false, false, - "String", 0, 0, null, false, null, null, null, null, null, false); - protected final ColumnInfo _columnRequestedAt = cci("requestedAt", "requestedAt", null, null, LocalDateTime.class, "requestedAt", null, - false, false, false, "LocalDateTime", 0, 0, null, false, null, null, null, null, null, false); - protected final ColumnInfo _columnResponseTime = cci("responseTime", "responseTime", null, null, Long.class, "responseTime", null, - false, false, false, "Long", 0, 0, null, false, null, null, null, null, null, false); - protected final ColumnInfo _columnQueryTime = cci("queryTime", "queryTime", null, null, Long.class, "queryTime", null, false, false, - false, "Long", 0, 0, null, false, null, null, null, null, null, false); - protected final ColumnInfo _columnSearchWord = cci("searchWord", "searchWord", null, null, String.class, "searchWord", null, false, - false, false, "String", 0, 0, null, false, null, null, null, null, null, false); - protected final ColumnInfo _columnUserAgent = cci("userAgent", "userAgent", null, null, String.class, "userAgent", null, false, false, - false, "String", 0, 0, null, false, null, null, null, null, null, false); - protected final ColumnInfo _columnUserInfoId = cci("userInfoId", "userInfoId", null, null, String.class, "userInfoId", null, false, - false, false, "String", 0, 0, null, false, null, null, null, null, null, false); - protected final ColumnInfo _columnUserSessionId = cci("userSessionId", "userSessionId", null, null, String.class, "userSessionId", - null, false, false, false, "String", 0, 0, null, false, null, null, null, null, null, false); + protected final ColumnInfo _columnAccessType = cci("accessType", "accessType", null, null, String.class, "accessType", null, false, false, false, "String", 0, 0, null, false, null, null, null, null, null, false); + protected final ColumnInfo _columnUser = cci("user", "user", null, null, String.class, "user", null, false, false, false, "String", 0, 0, null, false, null, null, null, null, null, false); + protected final ColumnInfo _columnQueryId = cci("queryId", "queryId", null, null, String.class, "queryId", null, false, false, false, "String", 0, 0, null, false, null, null, null, null, null, false); + protected final ColumnInfo _columnClientIp = cci("clientIp", "clientIp", null, null, String.class, "clientIp", null, false, false, false, "String", 0, 0, null, false, null, null, null, null, null, false); + protected final ColumnInfo _columnHitCount = cci("hitCount", "hitCount", null, null, Long.class, "hitCount", null, false, false, false, "Long", 0, 0, null, false, null, null, null, null, null, false); + protected final ColumnInfo _columnQueryOffset = cci("queryOffset", "queryOffset", null, null, Integer.class, "queryOffset", null, false, false, false, "Integer", 0, 0, null, false, null, null, null, null, null, false); + protected final ColumnInfo _columnQueryPageSize = cci("queryPageSize", "queryPageSize", null, null, Integer.class, "queryPageSize", null, false, false, false, "Integer", 0, 0, null, false, null, null, null, null, null, false); + protected final ColumnInfo _columnReferer = cci("referer", "referer", null, null, String.class, "referer", null, false, false, false, "String", 0, 0, null, false, null, null, null, null, null, false); + protected final ColumnInfo _columnRequestedAt = cci("requestedAt", "requestedAt", null, null, LocalDateTime.class, "requestedAt", null, false, false, false, "LocalDateTime", 0, 0, null, false, null, null, null, null, null, false); + protected final ColumnInfo _columnResponseTime = cci("responseTime", "responseTime", null, null, Long.class, "responseTime", null, false, false, false, "Long", 0, 0, null, false, null, null, null, null, null, false); + protected final ColumnInfo _columnQueryTime = cci("queryTime", "queryTime", null, null, Long.class, "queryTime", null, false, false, false, "Long", 0, 0, null, false, null, null, null, null, null, false); + protected final ColumnInfo _columnSearchWord = cci("searchWord", "searchWord", null, null, String.class, "searchWord", null, false, false, false, "String", 0, 0, null, false, null, null, null, null, null, false); + protected final ColumnInfo _columnUserAgent = cci("userAgent", "userAgent", null, null, String.class, "userAgent", null, false, false, false, "String", 0, 0, null, false, null, null, null, null, null, false); + protected final ColumnInfo _columnUserInfoId = cci("userInfoId", "userInfoId", null, null, String.class, "userInfoId", null, false, false, false, "String", 0, 0, null, false, null, null, null, null, null, false); + protected final ColumnInfo _columnUserSessionId = cci("userSessionId", "userSessionId", null, null, String.class, "userSessionId", null, false, false, false, "String", 0, 0, null, false, null, null, null, null, null, false); - public ColumnInfo columnAccessType() { - return _columnAccessType; - } - - public ColumnInfo columnUser() { - return _columnUser; - } - - public ColumnInfo columnQueryId() { - return _columnQueryId; - } - - public ColumnInfo columnClientIp() { - return _columnClientIp; - } - - public ColumnInfo columnHitCount() { - return _columnHitCount; - } - - public ColumnInfo columnQueryOffset() { - return _columnQueryOffset; - } - - public ColumnInfo columnQueryPageSize() { - return _columnQueryPageSize; - } - - public ColumnInfo columnReferer() { - return _columnReferer; - } - - public ColumnInfo columnRequestedAt() { - return _columnRequestedAt; - } - - public ColumnInfo columnResponseTime() { - return _columnResponseTime; - } - - public ColumnInfo columnQueryTime() { - return _columnQueryTime; - } - - public ColumnInfo columnSearchWord() { - return _columnSearchWord; - } - - public ColumnInfo columnUserAgent() { - return _columnUserAgent; - } - - public ColumnInfo columnUserInfoId() { - return _columnUserInfoId; - } - - public ColumnInfo columnUserSessionId() { - return _columnUserSessionId; - } + public ColumnInfo columnAccessType() { return _columnAccessType; } + public ColumnInfo columnUser() { return _columnUser; } + public ColumnInfo columnQueryId() { return _columnQueryId; } + public ColumnInfo columnClientIp() { return _columnClientIp; } + public ColumnInfo columnHitCount() { return _columnHitCount; } + public ColumnInfo columnQueryOffset() { return _columnQueryOffset; } + public ColumnInfo columnQueryPageSize() { return _columnQueryPageSize; } + public ColumnInfo columnReferer() { return _columnReferer; } + public ColumnInfo columnRequestedAt() { return _columnRequestedAt; } + public ColumnInfo columnResponseTime() { return _columnResponseTime; } + public ColumnInfo columnQueryTime() { return _columnQueryTime; } + public ColumnInfo columnSearchWord() { return _columnSearchWord; } + public ColumnInfo columnUserAgent() { return _columnUserAgent; } + public ColumnInfo columnUserInfoId() { return _columnUserInfoId; } + public ColumnInfo columnUserSessionId() { return _columnUserSessionId; } protected List ccil() { List ls = newArrayList(); @@ -325,3 +244,4 @@ public class SearchLogDbm extends AbstractDBMeta { return null; } } + diff --git a/src/main/java/org/codelibs/fess/es/log/bsentity/dbmeta/UserInfoDbm.java b/src/main/java/org/codelibs/fess/es/log/bsentity/dbmeta/UserInfoDbm.java index 0a956c4c8..3310b0293 100644 --- a/src/main/java/org/codelibs/fess/es/log/bsentity/dbmeta/UserInfoDbm.java +++ b/src/main/java/org/codelibs/fess/es/log/bsentity/dbmeta/UserInfoDbm.java @@ -15,11 +15,12 @@ */ package org.codelibs.fess.es.log.bsentity.dbmeta; -import java.time.LocalDateTime; +import java.time.*; import java.util.List; import java.util.Map; import org.codelibs.fess.es.log.exentity.UserInfo; + import org.dbflute.Entity; import org.dbflute.dbmeta.AbstractDBMeta; import org.dbflute.dbmeta.info.ColumnInfo; @@ -79,10 +80,8 @@ public class UserInfoDbm extends AbstractDBMeta { // --------------- protected final Map _epgMap = newHashMap(); { - setupEpg(_epgMap, et -> ((UserInfo) et).getCreatedAt(), (et, vl) -> ((UserInfo) et).setCreatedAt(DfTypeUtil.toLocalDateTime(vl)), - "createdAt"); - setupEpg(_epgMap, et -> ((UserInfo) et).getUpdatedAt(), (et, vl) -> ((UserInfo) et).setUpdatedAt(DfTypeUtil.toLocalDateTime(vl)), - "updatedAt"); + setupEpg(_epgMap, et-> ((UserInfo)et).getCreatedAt(),(et,vl)->((UserInfo) et).setCreatedAt(DfTypeUtil.toLocalDateTime(vl)), "createdAt"); + setupEpg(_epgMap, et-> ((UserInfo)et).getUpdatedAt(),(et,vl)->((UserInfo) et).setUpdatedAt(DfTypeUtil.toLocalDateTime(vl)), "updatedAt"); } @Override @@ -96,41 +95,22 @@ public class UserInfoDbm extends AbstractDBMeta { protected final String _tableDbName = "user_info"; protected final String _tableDispName = "user_info"; protected final String _tablePropertyName = "UserInfo"; - - public String getTableDbName() { - return _tableDbName; - } - + public String getTableDbName() { return _tableDbName; } @Override - public String getTableDispName() { - return _tableDispName; - } - + public String getTableDispName() { return _tableDispName; } @Override - public String getTablePropertyName() { - return _tablePropertyName; - } - + public String getTablePropertyName() { return _tablePropertyName; } @Override - public TableSqlName getTableSqlName() { - return null; - } + public TableSqlName getTableSqlName() { return null; } // =================================================================================== // Column Info // =========== - protected final ColumnInfo _columnCreatedAt = cci("createdAt", "createdAt", null, null, LocalDateTime.class, "createdAt", null, false, - false, false, "LocalDateTime", 0, 0, null, false, null, null, null, null, null, false); - protected final ColumnInfo _columnUpdatedAt = cci("updatedAt", "updatedAt", null, null, LocalDateTime.class, "updatedAt", null, false, - false, false, "LocalDateTime", 0, 0, null, false, null, null, null, null, null, false); + protected final ColumnInfo _columnCreatedAt = cci("createdAt", "createdAt", null, null, LocalDateTime.class, "createdAt", null, false, false, false, "LocalDateTime", 0, 0, null, false, null, null, null, null, null, false); + protected final ColumnInfo _columnUpdatedAt = cci("updatedAt", "updatedAt", null, null, LocalDateTime.class, "updatedAt", null, false, false, false, "LocalDateTime", 0, 0, null, false, null, null, null, null, null, false); - public ColumnInfo columnCreatedAt() { - return _columnCreatedAt; - } - - public ColumnInfo columnUpdatedAt() { - return _columnUpdatedAt; - } + public ColumnInfo columnCreatedAt() { return _columnCreatedAt; } + public ColumnInfo columnUpdatedAt() { return _columnUpdatedAt; } protected List ccil() { List ls = newArrayList(); @@ -212,3 +192,4 @@ public class UserInfoDbm extends AbstractDBMeta { return null; } } + diff --git a/src/main/java/org/codelibs/fess/es/log/cbean/bs/BsClickLogCB.java b/src/main/java/org/codelibs/fess/es/log/cbean/bs/BsClickLogCB.java index a96550941..6c594efc1 100644 --- a/src/main/java/org/codelibs/fess/es/log/cbean/bs/BsClickLogCB.java +++ b/src/main/java/org/codelibs/fess/es/log/cbean/bs/BsClickLogCB.java @@ -75,7 +75,7 @@ public class BsClickLogCB extends EsAbstractConditionBean { @Override public void acceptPrimaryKeyMap(Map primaryKeyMap) { - acceptPK((String) primaryKeyMap.get("_id")); + acceptPK((String)primaryKeyMap.get("_id")); } // =================================================================================== @@ -161,27 +161,21 @@ public class BsClickLogCB extends EsAbstractConditionBean { public void columnQueryRequestedAt() { doColumn("queryRequestedAt"); } - public void columnRequestedAt() { doColumn("requestedAt"); } - public void columnQueryId() { doColumn("queryId"); } - public void columnDocId() { doColumn("docId"); } - public void columnUserSessionId() { doColumn("userSessionId"); } - public void columnUrl() { doColumn("url"); } - public void columnOrder() { doColumn("order"); } diff --git a/src/main/java/org/codelibs/fess/es/log/cbean/bs/BsEventLogCB.java b/src/main/java/org/codelibs/fess/es/log/cbean/bs/BsEventLogCB.java index f4f4727dd..108ca6aab 100644 --- a/src/main/java/org/codelibs/fess/es/log/cbean/bs/BsEventLogCB.java +++ b/src/main/java/org/codelibs/fess/es/log/cbean/bs/BsEventLogCB.java @@ -75,7 +75,7 @@ public class BsEventLogCB extends EsAbstractConditionBean { @Override public void acceptPrimaryKeyMap(Map primaryKeyMap) { - acceptPK((String) primaryKeyMap.get("_id")); + acceptPK((String)primaryKeyMap.get("_id")); } // =================================================================================== @@ -161,19 +161,15 @@ public class BsEventLogCB extends EsAbstractConditionBean { public void columnCreatedAt() { doColumn("createdAt"); } - public void columnCreatedBy() { doColumn("createdBy"); } - public void columnEventType() { doColumn("eventType"); } - public void columnMessage() { doColumn("message"); } - public void columnPath() { doColumn("path"); } diff --git a/src/main/java/org/codelibs/fess/es/log/cbean/bs/BsFavoriteLogCB.java b/src/main/java/org/codelibs/fess/es/log/cbean/bs/BsFavoriteLogCB.java index 5fd5258bb..e785c76b4 100644 --- a/src/main/java/org/codelibs/fess/es/log/cbean/bs/BsFavoriteLogCB.java +++ b/src/main/java/org/codelibs/fess/es/log/cbean/bs/BsFavoriteLogCB.java @@ -75,7 +75,7 @@ public class BsFavoriteLogCB extends EsAbstractConditionBean { @Override public void acceptPrimaryKeyMap(Map primaryKeyMap) { - acceptPK((String) primaryKeyMap.get("_id")); + acceptPK((String)primaryKeyMap.get("_id")); } // =================================================================================== @@ -161,19 +161,15 @@ public class BsFavoriteLogCB extends EsAbstractConditionBean { public void columnCreatedAt() { doColumn("createdAt"); } - public void columnUrl() { doColumn("url"); } - public void columnDocId() { doColumn("docId"); } - public void columnQueryId() { doColumn("queryId"); } - public void columnUserInfoId() { doColumn("userInfoId"); } diff --git a/src/main/java/org/codelibs/fess/es/log/cbean/bs/BsSearchFieldLogCB.java b/src/main/java/org/codelibs/fess/es/log/cbean/bs/BsSearchFieldLogCB.java index 4a4302353..240689e22 100644 --- a/src/main/java/org/codelibs/fess/es/log/cbean/bs/BsSearchFieldLogCB.java +++ b/src/main/java/org/codelibs/fess/es/log/cbean/bs/BsSearchFieldLogCB.java @@ -75,7 +75,7 @@ public class BsSearchFieldLogCB extends EsAbstractConditionBean { @Override public void acceptPrimaryKeyMap(Map primaryKeyMap) { - acceptPK((String) primaryKeyMap.get("_id")); + acceptPK((String)primaryKeyMap.get("_id")); } // =================================================================================== @@ -161,11 +161,9 @@ public class BsSearchFieldLogCB extends EsAbstractConditionBean { public void columnName() { doColumn("name"); } - public void columnSearchLogId() { doColumn("searchLogId"); } - public void columnValue() { doColumn("value"); } diff --git a/src/main/java/org/codelibs/fess/es/log/cbean/bs/BsSearchLogCB.java b/src/main/java/org/codelibs/fess/es/log/cbean/bs/BsSearchLogCB.java index e1b6ae1e1..18be5bae7 100644 --- a/src/main/java/org/codelibs/fess/es/log/cbean/bs/BsSearchLogCB.java +++ b/src/main/java/org/codelibs/fess/es/log/cbean/bs/BsSearchLogCB.java @@ -75,7 +75,7 @@ public class BsSearchLogCB extends EsAbstractConditionBean { @Override public void acceptPrimaryKeyMap(Map primaryKeyMap) { - acceptPK((String) primaryKeyMap.get("_id")); + acceptPK((String)primaryKeyMap.get("_id")); } // =================================================================================== @@ -161,59 +161,45 @@ public class BsSearchLogCB extends EsAbstractConditionBean { public void columnAccessType() { doColumn("accessType"); } - public void columnUser() { doColumn("user"); } - public void columnQueryId() { doColumn("queryId"); } - public void columnClientIp() { doColumn("clientIp"); } - public void columnHitCount() { doColumn("hitCount"); } - public void columnQueryOffset() { doColumn("queryOffset"); } - public void columnQueryPageSize() { doColumn("queryPageSize"); } - public void columnReferer() { doColumn("referer"); } - public void columnRequestedAt() { doColumn("requestedAt"); } - public void columnResponseTime() { doColumn("responseTime"); } - public void columnQueryTime() { doColumn("queryTime"); } - public void columnSearchWord() { doColumn("searchWord"); } - public void columnUserAgent() { doColumn("userAgent"); } - public void columnUserInfoId() { doColumn("userInfoId"); } - public void columnUserSessionId() { doColumn("userSessionId"); } diff --git a/src/main/java/org/codelibs/fess/es/log/cbean/bs/BsUserInfoCB.java b/src/main/java/org/codelibs/fess/es/log/cbean/bs/BsUserInfoCB.java index bb16ddaf3..2405d7eef 100644 --- a/src/main/java/org/codelibs/fess/es/log/cbean/bs/BsUserInfoCB.java +++ b/src/main/java/org/codelibs/fess/es/log/cbean/bs/BsUserInfoCB.java @@ -75,7 +75,7 @@ public class BsUserInfoCB extends EsAbstractConditionBean { @Override public void acceptPrimaryKeyMap(Map primaryKeyMap) { - acceptPK((String) primaryKeyMap.get("_id")); + acceptPK((String)primaryKeyMap.get("_id")); } // =================================================================================== @@ -161,7 +161,6 @@ public class BsUserInfoCB extends EsAbstractConditionBean { public void columnCreatedAt() { doColumn("createdAt"); } - public void columnUpdatedAt() { doColumn("updatedAt"); } diff --git a/src/main/java/org/codelibs/fess/es/log/cbean/cq/bs/BsClickLogCQ.java b/src/main/java/org/codelibs/fess/es/log/cbean/cq/bs/BsClickLogCQ.java index 67fe301ae..4e6ece5b1 100644 --- a/src/main/java/org/codelibs/fess/es/log/cbean/cq/bs/BsClickLogCQ.java +++ b/src/main/java/org/codelibs/fess/es/log/cbean/cq/bs/BsClickLogCQ.java @@ -15,7 +15,7 @@ */ package org.codelibs.fess.es.log.cbean.cq.bs; -import java.time.LocalDateTime; +import java.time.*; import java.util.Collection; import org.codelibs.fess.es.log.allcommon.EsAbstractConditionQuery; @@ -33,6 +33,7 @@ import org.elasticsearch.index.query.RangeQueryBuilder; import org.elasticsearch.index.query.TermQueryBuilder; import org.elasticsearch.index.query.TermsQueryBuilder; + /** * @author ESFlute (using FreeGen) */ @@ -60,8 +61,9 @@ public abstract class BsClickLogCQ extends EsAbstractConditionQuery { filtered(filteredLambda, null); } - public void filtered(FilteredCall filteredLambda, ConditionOptionCall opLambda) { - bool((must, should, mustNot, filter) -> { + public void filtered(FilteredCall filteredLambda, + ConditionOptionCall opLambda) { + bool((must, should, mustNot, filter)->{ filteredLambda.callback(must, filter); }, opLambda); } @@ -96,9 +98,7 @@ public abstract class BsClickLogCQ extends EsAbstractConditionQuery { ClickLogCQ filterQuery = new ClickLogCQ(); boolLambda.callback(mustQuery, shouldQuery, mustNotQuery, filterQuery); if (mustQuery.hasQueries() || shouldQuery.hasQueries() || mustNotQuery.hasQueries() || filterQuery.hasQueries()) { - BoolQueryBuilder builder = - regBoolCQ(mustQuery.getQueryBuilderList(), shouldQuery.getQueryBuilderList(), mustNotQuery.getQueryBuilderList(), - filterQuery.getQueryBuilderList()); + BoolQueryBuilder builder = regBoolCQ(mustQuery.getQueryBuilderList(), shouldQuery.getQueryBuilderList(), mustNotQuery.getQueryBuilderList(), filterQuery.getQueryBuilderList()); if (opLambda != null) { opLambda.callback(builder); } diff --git a/src/main/java/org/codelibs/fess/es/log/cbean/cq/bs/BsEventLogCQ.java b/src/main/java/org/codelibs/fess/es/log/cbean/cq/bs/BsEventLogCQ.java index ff2dcf679..04e78618b 100644 --- a/src/main/java/org/codelibs/fess/es/log/cbean/cq/bs/BsEventLogCQ.java +++ b/src/main/java/org/codelibs/fess/es/log/cbean/cq/bs/BsEventLogCQ.java @@ -15,7 +15,7 @@ */ package org.codelibs.fess.es.log.cbean.cq.bs; -import java.time.LocalDateTime; +import java.time.*; import java.util.Collection; import org.codelibs.fess.es.log.allcommon.EsAbstractConditionQuery; @@ -33,6 +33,7 @@ import org.elasticsearch.index.query.RangeQueryBuilder; import org.elasticsearch.index.query.TermQueryBuilder; import org.elasticsearch.index.query.TermsQueryBuilder; + /** * @author ESFlute (using FreeGen) */ @@ -60,8 +61,9 @@ public abstract class BsEventLogCQ extends EsAbstractConditionQuery { filtered(filteredLambda, null); } - public void filtered(FilteredCall filteredLambda, ConditionOptionCall opLambda) { - bool((must, should, mustNot, filter) -> { + public void filtered(FilteredCall filteredLambda, + ConditionOptionCall opLambda) { + bool((must, should, mustNot, filter)->{ filteredLambda.callback(must, filter); }, opLambda); } @@ -96,9 +98,7 @@ public abstract class BsEventLogCQ extends EsAbstractConditionQuery { EventLogCQ filterQuery = new EventLogCQ(); boolLambda.callback(mustQuery, shouldQuery, mustNotQuery, filterQuery); if (mustQuery.hasQueries() || shouldQuery.hasQueries() || mustNotQuery.hasQueries() || filterQuery.hasQueries()) { - BoolQueryBuilder builder = - regBoolCQ(mustQuery.getQueryBuilderList(), shouldQuery.getQueryBuilderList(), mustNotQuery.getQueryBuilderList(), - filterQuery.getQueryBuilderList()); + BoolQueryBuilder builder = regBoolCQ(mustQuery.getQueryBuilderList(), shouldQuery.getQueryBuilderList(), mustNotQuery.getQueryBuilderList(), filterQuery.getQueryBuilderList()); if (opLambda != null) { opLambda.callback(builder); } diff --git a/src/main/java/org/codelibs/fess/es/log/cbean/cq/bs/BsFavoriteLogCQ.java b/src/main/java/org/codelibs/fess/es/log/cbean/cq/bs/BsFavoriteLogCQ.java index f0646dc38..a7b4e08ed 100644 --- a/src/main/java/org/codelibs/fess/es/log/cbean/cq/bs/BsFavoriteLogCQ.java +++ b/src/main/java/org/codelibs/fess/es/log/cbean/cq/bs/BsFavoriteLogCQ.java @@ -15,7 +15,7 @@ */ package org.codelibs.fess.es.log.cbean.cq.bs; -import java.time.LocalDateTime; +import java.time.*; import java.util.Collection; import org.codelibs.fess.es.log.allcommon.EsAbstractConditionQuery; @@ -33,6 +33,7 @@ import org.elasticsearch.index.query.RangeQueryBuilder; import org.elasticsearch.index.query.TermQueryBuilder; import org.elasticsearch.index.query.TermsQueryBuilder; + /** * @author ESFlute (using FreeGen) */ @@ -60,8 +61,9 @@ public abstract class BsFavoriteLogCQ extends EsAbstractConditionQuery { filtered(filteredLambda, null); } - public void filtered(FilteredCall filteredLambda, ConditionOptionCall opLambda) { - bool((must, should, mustNot, filter) -> { + public void filtered(FilteredCall filteredLambda, + ConditionOptionCall opLambda) { + bool((must, should, mustNot, filter)->{ filteredLambda.callback(must, filter); }, opLambda); } @@ -96,9 +98,7 @@ public abstract class BsFavoriteLogCQ extends EsAbstractConditionQuery { FavoriteLogCQ filterQuery = new FavoriteLogCQ(); boolLambda.callback(mustQuery, shouldQuery, mustNotQuery, filterQuery); if (mustQuery.hasQueries() || shouldQuery.hasQueries() || mustNotQuery.hasQueries() || filterQuery.hasQueries()) { - BoolQueryBuilder builder = - regBoolCQ(mustQuery.getQueryBuilderList(), shouldQuery.getQueryBuilderList(), mustNotQuery.getQueryBuilderList(), - filterQuery.getQueryBuilderList()); + BoolQueryBuilder builder = regBoolCQ(mustQuery.getQueryBuilderList(), shouldQuery.getQueryBuilderList(), mustNotQuery.getQueryBuilderList(), filterQuery.getQueryBuilderList()); if (opLambda != null) { opLambda.callback(builder); } diff --git a/src/main/java/org/codelibs/fess/es/log/cbean/cq/bs/BsSearchFieldLogCQ.java b/src/main/java/org/codelibs/fess/es/log/cbean/cq/bs/BsSearchFieldLogCQ.java index 74143321d..0dea842b5 100644 --- a/src/main/java/org/codelibs/fess/es/log/cbean/cq/bs/BsSearchFieldLogCQ.java +++ b/src/main/java/org/codelibs/fess/es/log/cbean/cq/bs/BsSearchFieldLogCQ.java @@ -15,7 +15,7 @@ */ package org.codelibs.fess.es.log.cbean.cq.bs; -import java.time.LocalDateTime; +import java.time.*; import java.util.Collection; import org.codelibs.fess.es.log.allcommon.EsAbstractConditionQuery; @@ -33,6 +33,7 @@ import org.elasticsearch.index.query.RangeQueryBuilder; import org.elasticsearch.index.query.TermQueryBuilder; import org.elasticsearch.index.query.TermsQueryBuilder; + /** * @author ESFlute (using FreeGen) */ @@ -60,8 +61,9 @@ public abstract class BsSearchFieldLogCQ extends EsAbstractConditionQuery { filtered(filteredLambda, null); } - public void filtered(FilteredCall filteredLambda, ConditionOptionCall opLambda) { - bool((must, should, mustNot, filter) -> { + public void filtered(FilteredCall filteredLambda, + ConditionOptionCall opLambda) { + bool((must, should, mustNot, filter)->{ filteredLambda.callback(must, filter); }, opLambda); } @@ -96,9 +98,7 @@ public abstract class BsSearchFieldLogCQ extends EsAbstractConditionQuery { SearchFieldLogCQ filterQuery = new SearchFieldLogCQ(); boolLambda.callback(mustQuery, shouldQuery, mustNotQuery, filterQuery); if (mustQuery.hasQueries() || shouldQuery.hasQueries() || mustNotQuery.hasQueries() || filterQuery.hasQueries()) { - BoolQueryBuilder builder = - regBoolCQ(mustQuery.getQueryBuilderList(), shouldQuery.getQueryBuilderList(), mustNotQuery.getQueryBuilderList(), - filterQuery.getQueryBuilderList()); + BoolQueryBuilder builder = regBoolCQ(mustQuery.getQueryBuilderList(), shouldQuery.getQueryBuilderList(), mustNotQuery.getQueryBuilderList(), filterQuery.getQueryBuilderList()); if (opLambda != null) { opLambda.callback(builder); } diff --git a/src/main/java/org/codelibs/fess/es/log/cbean/cq/bs/BsSearchLogCQ.java b/src/main/java/org/codelibs/fess/es/log/cbean/cq/bs/BsSearchLogCQ.java index fbb015f32..87b69aeed 100644 --- a/src/main/java/org/codelibs/fess/es/log/cbean/cq/bs/BsSearchLogCQ.java +++ b/src/main/java/org/codelibs/fess/es/log/cbean/cq/bs/BsSearchLogCQ.java @@ -15,7 +15,7 @@ */ package org.codelibs.fess.es.log.cbean.cq.bs; -import java.time.LocalDateTime; +import java.time.*; import java.util.Collection; import org.codelibs.fess.es.log.allcommon.EsAbstractConditionQuery; @@ -33,6 +33,7 @@ import org.elasticsearch.index.query.RangeQueryBuilder; import org.elasticsearch.index.query.TermQueryBuilder; import org.elasticsearch.index.query.TermsQueryBuilder; + /** * @author ESFlute (using FreeGen) */ @@ -60,8 +61,9 @@ public abstract class BsSearchLogCQ extends EsAbstractConditionQuery { filtered(filteredLambda, null); } - public void filtered(FilteredCall filteredLambda, ConditionOptionCall opLambda) { - bool((must, should, mustNot, filter) -> { + public void filtered(FilteredCall filteredLambda, + ConditionOptionCall opLambda) { + bool((must, should, mustNot, filter)->{ filteredLambda.callback(must, filter); }, opLambda); } @@ -96,9 +98,7 @@ public abstract class BsSearchLogCQ extends EsAbstractConditionQuery { SearchLogCQ filterQuery = new SearchLogCQ(); boolLambda.callback(mustQuery, shouldQuery, mustNotQuery, filterQuery); if (mustQuery.hasQueries() || shouldQuery.hasQueries() || mustNotQuery.hasQueries() || filterQuery.hasQueries()) { - BoolQueryBuilder builder = - regBoolCQ(mustQuery.getQueryBuilderList(), shouldQuery.getQueryBuilderList(), mustNotQuery.getQueryBuilderList(), - filterQuery.getQueryBuilderList()); + BoolQueryBuilder builder = regBoolCQ(mustQuery.getQueryBuilderList(), shouldQuery.getQueryBuilderList(), mustNotQuery.getQueryBuilderList(), filterQuery.getQueryBuilderList()); if (opLambda != null) { opLambda.callback(builder); } diff --git a/src/main/java/org/codelibs/fess/es/log/cbean/cq/bs/BsUserInfoCQ.java b/src/main/java/org/codelibs/fess/es/log/cbean/cq/bs/BsUserInfoCQ.java index 7e150d0f0..273abd86a 100644 --- a/src/main/java/org/codelibs/fess/es/log/cbean/cq/bs/BsUserInfoCQ.java +++ b/src/main/java/org/codelibs/fess/es/log/cbean/cq/bs/BsUserInfoCQ.java @@ -15,7 +15,7 @@ */ package org.codelibs.fess.es.log.cbean.cq.bs; -import java.time.LocalDateTime; +import java.time.*; import java.util.Collection; import org.codelibs.fess.es.log.allcommon.EsAbstractConditionQuery; @@ -27,11 +27,13 @@ import org.elasticsearch.index.query.FuzzyQueryBuilder; import org.elasticsearch.index.query.IdsQueryBuilder; import org.elasticsearch.index.query.MatchQueryBuilder; import org.elasticsearch.index.query.NotQueryBuilder; +import org.elasticsearch.index.query.PrefixQueryBuilder; import org.elasticsearch.index.query.QueryBuilders; import org.elasticsearch.index.query.RangeQueryBuilder; import org.elasticsearch.index.query.TermQueryBuilder; import org.elasticsearch.index.query.TermsQueryBuilder; + /** * @author ESFlute (using FreeGen) */ @@ -59,8 +61,9 @@ public abstract class BsUserInfoCQ extends EsAbstractConditionQuery { filtered(filteredLambda, null); } - public void filtered(FilteredCall filteredLambda, ConditionOptionCall opLambda) { - bool((must, should, mustNot, filter) -> { + public void filtered(FilteredCall filteredLambda, + ConditionOptionCall opLambda) { + bool((must, should, mustNot, filter)->{ filteredLambda.callback(must, filter); }, opLambda); } @@ -95,9 +98,7 @@ public abstract class BsUserInfoCQ extends EsAbstractConditionQuery { UserInfoCQ filterQuery = new UserInfoCQ(); boolLambda.callback(mustQuery, shouldQuery, mustNotQuery, filterQuery); if (mustQuery.hasQueries() || shouldQuery.hasQueries() || mustNotQuery.hasQueries() || filterQuery.hasQueries()) { - BoolQueryBuilder builder = - regBoolCQ(mustQuery.getQueryBuilderList(), shouldQuery.getQueryBuilderList(), mustNotQuery.getQueryBuilderList(), - filterQuery.getQueryBuilderList()); + BoolQueryBuilder builder = regBoolCQ(mustQuery.getQueryBuilderList(), shouldQuery.getQueryBuilderList(), mustNotQuery.getQueryBuilderList(), filterQuery.getQueryBuilderList()); if (opLambda != null) { opLambda.callback(builder); } diff --git a/src/main/java/org/codelibs/fess/es/user/allcommon/EsAbstractBehavior.java b/src/main/java/org/codelibs/fess/es/user/allcommon/EsAbstractBehavior.java index c8868002f..df235289e 100644 --- a/src/main/java/org/codelibs/fess/es/user/allcommon/EsAbstractBehavior.java +++ b/src/main/java/org/codelibs/fess/es/user/allcommon/EsAbstractBehavior.java @@ -25,8 +25,11 @@ import java.util.function.Function; import javax.annotation.Resource; +import org.codelibs.fess.es.user.allcommon.EsAbstractEntity; import org.codelibs.fess.es.user.allcommon.EsAbstractEntity.DocMeta; import org.codelibs.fess.es.user.allcommon.EsAbstractEntity.RequestOptionCall; +import org.codelibs.fess.es.user.allcommon.EsAbstractConditionBean; +import org.codelibs.fess.es.user.allcommon.EsPagingResultBean; import org.dbflute.Entity; import org.dbflute.bhv.AbstractBehaviorWritable; import org.dbflute.bhv.readable.EntityRowHandler; @@ -70,11 +73,8 @@ public abstract class EsAbstractBehavior RESULT createEntity(Map source, Class entityType); // =================================================================================== @@ -178,9 +178,8 @@ public abstract class EsAbstractBehavior handler) { - final SearchRequestBuilder builder = - client.prepareSearch(asEsIndex()).setTypes(asEsIndexType()).setSearchType(SearchType.SCAN).setScroll(scrollForCursor) - .setSize(sizeForCursor); + final SearchRequestBuilder builder = client.prepareSearch(asEsIndex()).setTypes(asEsIndexType()).setSearchType(SearchType.SCAN) + .setScroll(scrollForCursor).setSize(sizeForCursor); ((EsAbstractConditionBean) cb).request().build(builder); final SearchResponse response = ((EsAbstractConditionBean) cb).build(builder).execute().actionGet(); @@ -288,9 +287,8 @@ public abstract class EsAbstractBehavior option) { - final SearchRequestBuilder builder = - client.prepareSearch(asEsIndex()).setTypes(asEsIndexType()).setSearchType(SearchType.SCAN).setScroll(scrollForDelete) - .setSize(sizeForDelete); + final SearchRequestBuilder builder = client.prepareSearch(asEsIndex()).setTypes(asEsIndexType()).setSearchType(SearchType.SCAN) + .setScroll(scrollForDelete).setSize(sizeForDelete); ((EsAbstractConditionBean) cb).request().build(builder); final SearchResponse response = ((EsAbstractConditionBean) cb).build(builder).execute().actionGet(); @@ -389,7 +387,6 @@ public abstract class EsAbstractBehavior mustList, List shouldList, List mustNotList, - List filterList) { + protected BoolQueryBuilder regBoolCQ(List mustList, List shouldList, List mustNotList, List filterList) { assertObjectNotNull("mustList", mustList); assertObjectNotNull("shouldList", shouldList); assertObjectNotNull("mustNotList", mustNotList); @@ -273,6 +272,7 @@ public abstract class EsAbstractConditionQuery implements ConditionQuery { registerOrderBy(field, false); } + protected void registerOrderBy(String field, boolean ascOrDesc) { assertObjectNotNull("field", field); if (fieldSortBuilderList == null) { @@ -285,7 +285,7 @@ public abstract class EsAbstractConditionQuery implements ConditionQuery { // Invalid Query // ============= protected void checkEsInvalidQuery(String name, Object value) { - if (value == null || (value instanceof String && ((String) value).isEmpty())) { + if (value == null || (value instanceof String && ((String)value).isEmpty())) { String msg = "Cannot register null or empty query: name=" + name + " value=" + value; throw new InvalidQueryRegisteredException(msg); } @@ -479,3 +479,4 @@ public abstract class EsAbstractConditionQuery implements ConditionQuery { void callback(CQ and); } } + diff --git a/src/main/java/org/codelibs/fess/es/user/allcommon/EsAbstractEntity.java b/src/main/java/org/codelibs/fess/es/user/allcommon/EsAbstractEntity.java index de2f738f4..6c1963794 100644 --- a/src/main/java/org/codelibs/fess/es/user/allcommon/EsAbstractEntity.java +++ b/src/main/java/org/codelibs/fess/es/user/allcommon/EsAbstractEntity.java @@ -283,3 +283,4 @@ public abstract class EsAbstractEntity implements Entity, Serializable, Cloneabl void callback(OP op); } } + diff --git a/src/main/java/org/codelibs/fess/es/user/allcommon/EsPagingResultBean.java b/src/main/java/org/codelibs/fess/es/user/allcommon/EsPagingResultBean.java index 7ace32857..213c7b52a 100644 --- a/src/main/java/org/codelibs/fess/es/user/allcommon/EsPagingResultBean.java +++ b/src/main/java/org/codelibs/fess/es/user/allcommon/EsPagingResultBean.java @@ -62,3 +62,4 @@ public class EsPagingResultBean extends PagingResultBean { this.failedShards = failedShards; } } + diff --git a/src/main/java/org/codelibs/fess/es/user/bsbhv/BsGroupBhv.java b/src/main/java/org/codelibs/fess/es/user/bsbhv/BsGroupBhv.java index ad65e64fa..7dcd4d26c 100644 --- a/src/main/java/org/codelibs/fess/es/user/bsbhv/BsGroupBhv.java +++ b/src/main/java/org/codelibs/fess/es/user/bsbhv/BsGroupBhv.java @@ -97,7 +97,8 @@ public abstract class BsGroupBhv extends EsAbstractBehavior { return doSelectOptionalEntity(cb, typeOfSelectedEntity()); } - protected OptionalEntity doSelectOptionalEntity(GroupCB cb, Class tp) { + protected OptionalEntity doSelectOptionalEntity(GroupCB cb, + Class tp) { return createOptionalEntity(doSelectEntity(cb, tp), cb); } @@ -165,7 +166,7 @@ public abstract class BsGroupBhv extends EsAbstractBehavior { } public void selectBulk(CBCall cbLambda, EntityRowHandler> entityLambda) { - delegateSelectBulk(createCB(cbLambda), entityLambda, typeOfSelectedEntity()); + delegateSelectBulk(createCB(cbLambda), entityLambda,typeOfSelectedEntity()); } // =================================================================================== @@ -245,3 +246,4 @@ public abstract class BsGroupBhv extends EsAbstractBehavior { // #pending create, modify, remove } + diff --git a/src/main/java/org/codelibs/fess/es/user/bsbhv/BsRoleBhv.java b/src/main/java/org/codelibs/fess/es/user/bsbhv/BsRoleBhv.java index ce1f91d05..87fa643db 100644 --- a/src/main/java/org/codelibs/fess/es/user/bsbhv/BsRoleBhv.java +++ b/src/main/java/org/codelibs/fess/es/user/bsbhv/BsRoleBhv.java @@ -97,7 +97,8 @@ public abstract class BsRoleBhv extends EsAbstractBehavior { return doSelectOptionalEntity(cb, typeOfSelectedEntity()); } - protected OptionalEntity doSelectOptionalEntity(RoleCB cb, Class tp) { + protected OptionalEntity doSelectOptionalEntity(RoleCB cb, + Class tp) { return createOptionalEntity(doSelectEntity(cb, tp), cb); } @@ -165,7 +166,7 @@ public abstract class BsRoleBhv extends EsAbstractBehavior { } public void selectBulk(CBCall cbLambda, EntityRowHandler> entityLambda) { - delegateSelectBulk(createCB(cbLambda), entityLambda, typeOfSelectedEntity()); + delegateSelectBulk(createCB(cbLambda), entityLambda,typeOfSelectedEntity()); } // =================================================================================== @@ -245,3 +246,4 @@ public abstract class BsRoleBhv extends EsAbstractBehavior { // #pending create, modify, remove } + diff --git a/src/main/java/org/codelibs/fess/es/user/bsbhv/BsUserBhv.java b/src/main/java/org/codelibs/fess/es/user/bsbhv/BsUserBhv.java index 9e4678910..766def5a8 100644 --- a/src/main/java/org/codelibs/fess/es/user/bsbhv/BsUserBhv.java +++ b/src/main/java/org/codelibs/fess/es/user/bsbhv/BsUserBhv.java @@ -100,7 +100,8 @@ public abstract class BsUserBhv extends EsAbstractBehavior { return doSelectOptionalEntity(cb, typeOfSelectedEntity()); } - protected OptionalEntity doSelectOptionalEntity(UserCB cb, Class tp) { + protected OptionalEntity doSelectOptionalEntity(UserCB cb, + Class tp) { return createOptionalEntity(doSelectEntity(cb, tp), cb); } @@ -168,7 +169,7 @@ public abstract class BsUserBhv extends EsAbstractBehavior { } public void selectBulk(CBCall cbLambda, EntityRowHandler> entityLambda) { - delegateSelectBulk(createCB(cbLambda), entityLambda, typeOfSelectedEntity()); + delegateSelectBulk(createCB(cbLambda), entityLambda,typeOfSelectedEntity()); } // =================================================================================== @@ -248,3 +249,4 @@ public abstract class BsUserBhv extends EsAbstractBehavior { // #pending create, modify, remove } + diff --git a/src/main/java/org/codelibs/fess/es/user/bsentity/BsGroup.java b/src/main/java/org/codelibs/fess/es/user/bsentity/BsGroup.java index 9afa876db..85844b4da 100644 --- a/src/main/java/org/codelibs/fess/es/user/bsentity/BsGroup.java +++ b/src/main/java/org/codelibs/fess/es/user/bsentity/BsGroup.java @@ -15,7 +15,7 @@ */ package org.codelibs.fess.es.user.bsentity; -import java.time.LocalDateTime; +import java.time.*; import java.util.HashMap; import java.util.Map; diff --git a/src/main/java/org/codelibs/fess/es/user/bsentity/BsRole.java b/src/main/java/org/codelibs/fess/es/user/bsentity/BsRole.java index 17e2c5739..1d6ef4877 100644 --- a/src/main/java/org/codelibs/fess/es/user/bsentity/BsRole.java +++ b/src/main/java/org/codelibs/fess/es/user/bsentity/BsRole.java @@ -15,7 +15,7 @@ */ package org.codelibs.fess.es.user.bsentity; -import java.time.LocalDateTime; +import java.time.*; import java.util.HashMap; import java.util.Map; diff --git a/src/main/java/org/codelibs/fess/es/user/bsentity/BsUser.java b/src/main/java/org/codelibs/fess/es/user/bsentity/BsUser.java index 227242c6e..742be5f17 100644 --- a/src/main/java/org/codelibs/fess/es/user/bsentity/BsUser.java +++ b/src/main/java/org/codelibs/fess/es/user/bsentity/BsUser.java @@ -15,7 +15,7 @@ */ package org.codelibs.fess.es.user.bsentity; -import java.time.LocalDateTime; +import java.time.*; import java.util.HashMap; import java.util.Map; diff --git a/src/main/java/org/codelibs/fess/es/user/bsentity/dbmeta/GroupDbm.java b/src/main/java/org/codelibs/fess/es/user/bsentity/dbmeta/GroupDbm.java index be622015a..8b9307d98 100644 --- a/src/main/java/org/codelibs/fess/es/user/bsentity/dbmeta/GroupDbm.java +++ b/src/main/java/org/codelibs/fess/es/user/bsentity/dbmeta/GroupDbm.java @@ -15,11 +15,12 @@ */ package org.codelibs.fess.es.user.bsentity.dbmeta; -import java.time.LocalDateTime; +import java.time.*; import java.util.List; import java.util.Map; import org.codelibs.fess.es.user.exentity.Group; + import org.dbflute.Entity; import org.dbflute.dbmeta.AbstractDBMeta; import org.dbflute.dbmeta.info.ColumnInfo; @@ -79,7 +80,7 @@ public class GroupDbm extends AbstractDBMeta { // --------------- protected final Map _epgMap = newHashMap(); { - setupEpg(_epgMap, et -> ((Group) et).getName(), (et, vl) -> ((Group) et).setName(DfTypeUtil.toString(vl)), "name"); + setupEpg(_epgMap, et-> ((Group)et).getName(),(et,vl)->((Group) et).setName(DfTypeUtil.toString(vl)), "name"); } @Override @@ -93,35 +94,20 @@ public class GroupDbm extends AbstractDBMeta { protected final String _tableDbName = "group"; protected final String _tableDispName = "group"; protected final String _tablePropertyName = "Group"; - - public String getTableDbName() { - return _tableDbName; - } - + public String getTableDbName() { return _tableDbName; } @Override - public String getTableDispName() { - return _tableDispName; - } - + public String getTableDispName() { return _tableDispName; } @Override - public String getTablePropertyName() { - return _tablePropertyName; - } - + public String getTablePropertyName() { return _tablePropertyName; } @Override - public TableSqlName getTableSqlName() { - return null; - } + public TableSqlName getTableSqlName() { return null; } // =================================================================================== // Column Info // =========== - protected final ColumnInfo _columnName = cci("name", "name", null, null, String.class, "name", null, false, false, false, "String", 0, - 0, null, false, null, null, null, null, null, false); + protected final ColumnInfo _columnName = cci("name", "name", null, null, String.class, "name", null, false, false, false, "String", 0, 0, null, false, null, null, null, null, null, false); - public ColumnInfo columnName() { - return _columnName; - } + public ColumnInfo columnName() { return _columnName; } protected List ccil() { List ls = newArrayList(); @@ -202,3 +188,4 @@ public class GroupDbm extends AbstractDBMeta { return null; } } + diff --git a/src/main/java/org/codelibs/fess/es/user/bsentity/dbmeta/RoleDbm.java b/src/main/java/org/codelibs/fess/es/user/bsentity/dbmeta/RoleDbm.java index 9fb8aeacc..ef85a9b79 100644 --- a/src/main/java/org/codelibs/fess/es/user/bsentity/dbmeta/RoleDbm.java +++ b/src/main/java/org/codelibs/fess/es/user/bsentity/dbmeta/RoleDbm.java @@ -15,11 +15,12 @@ */ package org.codelibs.fess.es.user.bsentity.dbmeta; -import java.time.LocalDateTime; +import java.time.*; import java.util.List; import java.util.Map; import org.codelibs.fess.es.user.exentity.Role; + import org.dbflute.Entity; import org.dbflute.dbmeta.AbstractDBMeta; import org.dbflute.dbmeta.info.ColumnInfo; @@ -79,7 +80,7 @@ public class RoleDbm extends AbstractDBMeta { // --------------- protected final Map _epgMap = newHashMap(); { - setupEpg(_epgMap, et -> ((Role) et).getName(), (et, vl) -> ((Role) et).setName(DfTypeUtil.toString(vl)), "name"); + setupEpg(_epgMap, et-> ((Role)et).getName(),(et,vl)->((Role) et).setName(DfTypeUtil.toString(vl)), "name"); } @Override @@ -93,35 +94,20 @@ public class RoleDbm extends AbstractDBMeta { protected final String _tableDbName = "role"; protected final String _tableDispName = "role"; protected final String _tablePropertyName = "Role"; - - public String getTableDbName() { - return _tableDbName; - } - + public String getTableDbName() { return _tableDbName; } @Override - public String getTableDispName() { - return _tableDispName; - } - + public String getTableDispName() { return _tableDispName; } @Override - public String getTablePropertyName() { - return _tablePropertyName; - } - + public String getTablePropertyName() { return _tablePropertyName; } @Override - public TableSqlName getTableSqlName() { - return null; - } + public TableSqlName getTableSqlName() { return null; } // =================================================================================== // Column Info // =========== - protected final ColumnInfo _columnName = cci("name", "name", null, null, String.class, "name", null, false, false, false, "String", 0, - 0, null, false, null, null, null, null, null, false); + protected final ColumnInfo _columnName = cci("name", "name", null, null, String.class, "name", null, false, false, false, "String", 0, 0, null, false, null, null, null, null, null, false); - public ColumnInfo columnName() { - return _columnName; - } + public ColumnInfo columnName() { return _columnName; } protected List ccil() { List ls = newArrayList(); @@ -202,3 +188,4 @@ public class RoleDbm extends AbstractDBMeta { return null; } } + diff --git a/src/main/java/org/codelibs/fess/es/user/bsentity/dbmeta/UserDbm.java b/src/main/java/org/codelibs/fess/es/user/bsentity/dbmeta/UserDbm.java index 95f422c7f..af77cd4be 100644 --- a/src/main/java/org/codelibs/fess/es/user/bsentity/dbmeta/UserDbm.java +++ b/src/main/java/org/codelibs/fess/es/user/bsentity/dbmeta/UserDbm.java @@ -15,11 +15,12 @@ */ package org.codelibs.fess.es.user.bsentity.dbmeta; -import java.time.LocalDateTime; +import java.time.*; import java.util.List; import java.util.Map; import org.codelibs.fess.es.user.exentity.User; + import org.dbflute.Entity; import org.dbflute.dbmeta.AbstractDBMeta; import org.dbflute.dbmeta.info.ColumnInfo; @@ -79,10 +80,10 @@ public class UserDbm extends AbstractDBMeta { // --------------- protected final Map _epgMap = newHashMap(); { - setupEpg(_epgMap, et -> ((User) et).getGroups(), (et, vl) -> ((User) et).setGroups((String[]) vl), "groups"); - setupEpg(_epgMap, et -> ((User) et).getName(), (et, vl) -> ((User) et).setName(DfTypeUtil.toString(vl)), "name"); - setupEpg(_epgMap, et -> ((User) et).getPassword(), (et, vl) -> ((User) et).setPassword(DfTypeUtil.toString(vl)), "password"); - setupEpg(_epgMap, et -> ((User) et).getRoles(), (et, vl) -> ((User) et).setRoles((String[]) vl), "roles"); + setupEpg(_epgMap, et-> ((User)et).getGroups(),(et,vl)->((User) et).setGroups((String[])vl), "groups"); + setupEpg(_epgMap, et-> ((User)et).getName(),(et,vl)->((User) et).setName(DfTypeUtil.toString(vl)), "name"); + setupEpg(_epgMap, et-> ((User)et).getPassword(),(et,vl)->((User) et).setPassword(DfTypeUtil.toString(vl)), "password"); + setupEpg(_epgMap, et-> ((User)et).getRoles(),(et,vl)->((User) et).setRoles((String[])vl), "roles"); } @Override @@ -96,53 +97,26 @@ public class UserDbm extends AbstractDBMeta { protected final String _tableDbName = "user"; protected final String _tableDispName = "user"; protected final String _tablePropertyName = "User"; - - public String getTableDbName() { - return _tableDbName; - } - + public String getTableDbName() { return _tableDbName; } @Override - public String getTableDispName() { - return _tableDispName; - } - + public String getTableDispName() { return _tableDispName; } @Override - public String getTablePropertyName() { - return _tablePropertyName; - } - + public String getTablePropertyName() { return _tablePropertyName; } @Override - public TableSqlName getTableSqlName() { - return null; - } + public TableSqlName getTableSqlName() { return null; } // =================================================================================== // Column Info // =========== - protected final ColumnInfo _columnGroups = cci("groups", "groups", null, null, String[].class, "groups", null, false, false, false, - "String", 0, 0, null, false, null, null, null, null, null, false); - protected final ColumnInfo _columnName = cci("name", "name", null, null, String.class, "name", null, false, false, false, "String", 0, - 0, null, false, null, null, null, null, null, false); - protected final ColumnInfo _columnPassword = cci("password", "password", null, null, String.class, "password", null, false, false, - false, "String", 0, 0, null, false, null, null, null, null, null, false); - protected final ColumnInfo _columnRoles = cci("roles", "roles", null, null, String[].class, "roles", null, false, false, false, - "String", 0, 0, null, false, null, null, null, null, null, false); + protected final ColumnInfo _columnGroups = cci("groups", "groups", null, null, String[].class, "groups", null, false, false, false, "String", 0, 0, null, false, null, null, null, null, null, false); + protected final ColumnInfo _columnName = cci("name", "name", null, null, String.class, "name", null, false, false, false, "String", 0, 0, null, false, null, null, null, null, null, false); + protected final ColumnInfo _columnPassword = cci("password", "password", null, null, String.class, "password", null, false, false, false, "String", 0, 0, null, false, null, null, null, null, null, false); + protected final ColumnInfo _columnRoles = cci("roles", "roles", null, null, String[].class, "roles", null, false, false, false, "String", 0, 0, null, false, null, null, null, null, null, false); - public ColumnInfo columnGroups() { - return _columnGroups; - } - - public ColumnInfo columnName() { - return _columnName; - } - - public ColumnInfo columnPassword() { - return _columnPassword; - } - - public ColumnInfo columnRoles() { - return _columnRoles; - } + public ColumnInfo columnGroups() { return _columnGroups; } + public ColumnInfo columnName() { return _columnName; } + public ColumnInfo columnPassword() { return _columnPassword; } + public ColumnInfo columnRoles() { return _columnRoles; } protected List ccil() { List ls = newArrayList(); @@ -226,3 +200,4 @@ public class UserDbm extends AbstractDBMeta { return null; } } + diff --git a/src/main/java/org/codelibs/fess/es/user/cbean/bs/BsGroupCB.java b/src/main/java/org/codelibs/fess/es/user/cbean/bs/BsGroupCB.java index 27661c411..9a4dda598 100644 --- a/src/main/java/org/codelibs/fess/es/user/cbean/bs/BsGroupCB.java +++ b/src/main/java/org/codelibs/fess/es/user/cbean/bs/BsGroupCB.java @@ -75,7 +75,7 @@ public class BsGroupCB extends EsAbstractConditionBean { @Override public void acceptPrimaryKeyMap(Map primaryKeyMap) { - acceptPK((String) primaryKeyMap.get("_id")); + acceptPK((String)primaryKeyMap.get("_id")); } // =================================================================================== diff --git a/src/main/java/org/codelibs/fess/es/user/cbean/bs/BsRoleCB.java b/src/main/java/org/codelibs/fess/es/user/cbean/bs/BsRoleCB.java index ee1edd2bf..a4df5d723 100644 --- a/src/main/java/org/codelibs/fess/es/user/cbean/bs/BsRoleCB.java +++ b/src/main/java/org/codelibs/fess/es/user/cbean/bs/BsRoleCB.java @@ -75,7 +75,7 @@ public class BsRoleCB extends EsAbstractConditionBean { @Override public void acceptPrimaryKeyMap(Map primaryKeyMap) { - acceptPK((String) primaryKeyMap.get("_id")); + acceptPK((String)primaryKeyMap.get("_id")); } // =================================================================================== diff --git a/src/main/java/org/codelibs/fess/es/user/cbean/bs/BsUserCB.java b/src/main/java/org/codelibs/fess/es/user/cbean/bs/BsUserCB.java index d26d2d461..fbe7ff344 100644 --- a/src/main/java/org/codelibs/fess/es/user/cbean/bs/BsUserCB.java +++ b/src/main/java/org/codelibs/fess/es/user/cbean/bs/BsUserCB.java @@ -75,7 +75,7 @@ public class BsUserCB extends EsAbstractConditionBean { @Override public void acceptPrimaryKeyMap(Map primaryKeyMap) { - acceptPK((String) primaryKeyMap.get("_id")); + acceptPK((String)primaryKeyMap.get("_id")); } // =================================================================================== @@ -161,15 +161,12 @@ public class BsUserCB extends EsAbstractConditionBean { public void columnGroups() { doColumn("groups"); } - public void columnName() { doColumn("name"); } - public void columnPassword() { doColumn("password"); } - public void columnRoles() { doColumn("roles"); } diff --git a/src/main/java/org/codelibs/fess/es/user/cbean/cq/bs/BsGroupCQ.java b/src/main/java/org/codelibs/fess/es/user/cbean/cq/bs/BsGroupCQ.java index eb84aaab3..07597466b 100644 --- a/src/main/java/org/codelibs/fess/es/user/cbean/cq/bs/BsGroupCQ.java +++ b/src/main/java/org/codelibs/fess/es/user/cbean/cq/bs/BsGroupCQ.java @@ -15,7 +15,7 @@ */ package org.codelibs.fess.es.user.cbean.cq.bs; -import java.time.LocalDateTime; +import java.time.*; import java.util.Collection; import org.codelibs.fess.es.user.allcommon.EsAbstractConditionQuery; @@ -33,6 +33,7 @@ import org.elasticsearch.index.query.RangeQueryBuilder; import org.elasticsearch.index.query.TermQueryBuilder; import org.elasticsearch.index.query.TermsQueryBuilder; + /** * @author ESFlute (using FreeGen) */ @@ -60,8 +61,9 @@ public abstract class BsGroupCQ extends EsAbstractConditionQuery { filtered(filteredLambda, null); } - public void filtered(FilteredCall filteredLambda, ConditionOptionCall opLambda) { - bool((must, should, mustNot, filter) -> { + public void filtered(FilteredCall filteredLambda, + ConditionOptionCall opLambda) { + bool((must, should, mustNot, filter)->{ filteredLambda.callback(must, filter); }, opLambda); } @@ -96,9 +98,7 @@ public abstract class BsGroupCQ extends EsAbstractConditionQuery { GroupCQ filterQuery = new GroupCQ(); boolLambda.callback(mustQuery, shouldQuery, mustNotQuery, filterQuery); if (mustQuery.hasQueries() || shouldQuery.hasQueries() || mustNotQuery.hasQueries() || filterQuery.hasQueries()) { - BoolQueryBuilder builder = - regBoolCQ(mustQuery.getQueryBuilderList(), shouldQuery.getQueryBuilderList(), mustNotQuery.getQueryBuilderList(), - filterQuery.getQueryBuilderList()); + BoolQueryBuilder builder = regBoolCQ(mustQuery.getQueryBuilderList(), shouldQuery.getQueryBuilderList(), mustNotQuery.getQueryBuilderList(), filterQuery.getQueryBuilderList()); if (opLambda != null) { opLambda.callback(builder); } diff --git a/src/main/java/org/codelibs/fess/es/user/cbean/cq/bs/BsRoleCQ.java b/src/main/java/org/codelibs/fess/es/user/cbean/cq/bs/BsRoleCQ.java index 1a347b093..a5c4848a5 100644 --- a/src/main/java/org/codelibs/fess/es/user/cbean/cq/bs/BsRoleCQ.java +++ b/src/main/java/org/codelibs/fess/es/user/cbean/cq/bs/BsRoleCQ.java @@ -15,7 +15,7 @@ */ package org.codelibs.fess.es.user.cbean.cq.bs; -import java.time.LocalDateTime; +import java.time.*; import java.util.Collection; import org.codelibs.fess.es.user.allcommon.EsAbstractConditionQuery; @@ -33,6 +33,7 @@ import org.elasticsearch.index.query.RangeQueryBuilder; import org.elasticsearch.index.query.TermQueryBuilder; import org.elasticsearch.index.query.TermsQueryBuilder; + /** * @author ESFlute (using FreeGen) */ @@ -60,8 +61,9 @@ public abstract class BsRoleCQ extends EsAbstractConditionQuery { filtered(filteredLambda, null); } - public void filtered(FilteredCall filteredLambda, ConditionOptionCall opLambda) { - bool((must, should, mustNot, filter) -> { + public void filtered(FilteredCall filteredLambda, + ConditionOptionCall opLambda) { + bool((must, should, mustNot, filter)->{ filteredLambda.callback(must, filter); }, opLambda); } @@ -96,9 +98,7 @@ public abstract class BsRoleCQ extends EsAbstractConditionQuery { RoleCQ filterQuery = new RoleCQ(); boolLambda.callback(mustQuery, shouldQuery, mustNotQuery, filterQuery); if (mustQuery.hasQueries() || shouldQuery.hasQueries() || mustNotQuery.hasQueries() || filterQuery.hasQueries()) { - BoolQueryBuilder builder = - regBoolCQ(mustQuery.getQueryBuilderList(), shouldQuery.getQueryBuilderList(), mustNotQuery.getQueryBuilderList(), - filterQuery.getQueryBuilderList()); + BoolQueryBuilder builder = regBoolCQ(mustQuery.getQueryBuilderList(), shouldQuery.getQueryBuilderList(), mustNotQuery.getQueryBuilderList(), filterQuery.getQueryBuilderList()); if (opLambda != null) { opLambda.callback(builder); } diff --git a/src/main/java/org/codelibs/fess/es/user/cbean/cq/bs/BsUserCQ.java b/src/main/java/org/codelibs/fess/es/user/cbean/cq/bs/BsUserCQ.java index 3d3d28c36..e1d893596 100644 --- a/src/main/java/org/codelibs/fess/es/user/cbean/cq/bs/BsUserCQ.java +++ b/src/main/java/org/codelibs/fess/es/user/cbean/cq/bs/BsUserCQ.java @@ -15,7 +15,7 @@ */ package org.codelibs.fess.es.user.cbean.cq.bs; -import java.time.LocalDateTime; +import java.time.*; import java.util.Collection; import org.codelibs.fess.es.user.allcommon.EsAbstractConditionQuery; @@ -33,6 +33,7 @@ import org.elasticsearch.index.query.RangeQueryBuilder; import org.elasticsearch.index.query.TermQueryBuilder; import org.elasticsearch.index.query.TermsQueryBuilder; + /** * @author ESFlute (using FreeGen) */ @@ -60,8 +61,9 @@ public abstract class BsUserCQ extends EsAbstractConditionQuery { filtered(filteredLambda, null); } - public void filtered(FilteredCall filteredLambda, ConditionOptionCall opLambda) { - bool((must, should, mustNot, filter) -> { + public void filtered(FilteredCall filteredLambda, + ConditionOptionCall opLambda) { + bool((must, should, mustNot, filter)->{ filteredLambda.callback(must, filter); }, opLambda); } @@ -96,9 +98,7 @@ public abstract class BsUserCQ extends EsAbstractConditionQuery { UserCQ filterQuery = new UserCQ(); boolLambda.callback(mustQuery, shouldQuery, mustNotQuery, filterQuery); if (mustQuery.hasQueries() || shouldQuery.hasQueries() || mustNotQuery.hasQueries() || filterQuery.hasQueries()) { - BoolQueryBuilder builder = - regBoolCQ(mustQuery.getQueryBuilderList(), shouldQuery.getQueryBuilderList(), mustNotQuery.getQueryBuilderList(), - filterQuery.getQueryBuilderList()); + BoolQueryBuilder builder = regBoolCQ(mustQuery.getQueryBuilderList(), shouldQuery.getQueryBuilderList(), mustNotQuery.getQueryBuilderList(), filterQuery.getQueryBuilderList()); if (opLambda != null) { opLambda.callback(builder); } diff --git a/src/main/java/org/codelibs/fess/exec/Crawler.java b/src/main/java/org/codelibs/fess/exec/Crawler.java index 625bed87d..10ff92185 100644 --- a/src/main/java/org/codelibs/fess/exec/Crawler.java +++ b/src/main/java/org/codelibs/fess/exec/Crawler.java @@ -34,11 +34,11 @@ import org.codelibs.core.beans.util.BeanUtil; import org.codelibs.core.lang.StringUtil; import org.codelibs.core.misc.DynamicProperties; import org.codelibs.fess.Constants; -import org.codelibs.fess.app.service.CrawlingSessionService; +import org.codelibs.fess.app.service.CrawlingInfoService; import org.codelibs.fess.app.service.PathMappingService; import org.codelibs.fess.crawler.client.EsClient; import org.codelibs.fess.es.client.FessEsClient; -import org.codelibs.fess.helper.CrawlingSessionHelper; +import org.codelibs.fess.helper.CrawlingInfoHelper; import org.codelibs.fess.helper.DataIndexHelper; import org.codelibs.fess.helper.DuplicateHostHelper; import org.codelibs.fess.helper.PathMappingHelper; @@ -79,7 +79,7 @@ public class Crawler implements Serializable { protected PathMappingService pathMappingService; @Resource - protected CrawlingSessionService crawlingSessionService; + protected CrawlingInfoService crawlingInfoService; @Resource protected DynamicProperties crawlerProperties; @@ -206,7 +206,7 @@ public class Crawler implements Serializable { options.sessionId = sdf.format(new Date()); } - final CrawlingSessionHelper crawlingSessionHelper = ComponentUtil.getCrawlingSessionHelper(); + final CrawlingInfoHelper crawlingInfoHelper = ComponentUtil.getCrawlingInfoHelper(); final DynamicProperties crawlerProperties = ComponentUtil.getCrawlerProperties(); if (StringUtil.isNotBlank(options.propertiesPath)) { @@ -225,7 +225,7 @@ public class Crawler implements Serializable { } try { - crawlingSessionHelper.store(options.sessionId, true); + crawlingInfoHelper.store(options.sessionId, true); final String dayForCleanupStr; if (StringUtil.isNotBlank(options.expires)) { dayForCleanupStr = options.expires; @@ -236,7 +236,7 @@ public class Crawler implements Serializable { try { dayForCleanup = Integer.parseInt(dayForCleanupStr); } catch (final NumberFormatException e) {} - crawlingSessionHelper.updateParams(options.sessionId, options.name, dayForCleanup); + crawlingInfoHelper.updateParams(options.sessionId, options.name, dayForCleanup); } catch (final Exception e) { logger.warn("Failed to store crawling information.", e); } @@ -245,12 +245,12 @@ public class Crawler implements Serializable { return crawler.doCrawl(options); } finally { try { - crawlingSessionHelper.store(options.sessionId, false); + crawlingInfoHelper.store(options.sessionId, false); } catch (final Exception e) { logger.warn("Failed to store crawling information.", e); } - final Map infoMap = crawlingSessionHelper.getInfoMap(options.sessionId); + final Map infoMap = crawlingInfoHelper.getInfoMap(options.sessionId); final StringBuilder buf = new StringBuilder(500); for (final Map.Entry entry : infoMap.entrySet()) { @@ -317,12 +317,12 @@ public class Crawler implements Serializable { final long totalTime = System.currentTimeMillis(); - final CrawlingSessionHelper crawlingSessionHelper = ComponentUtil.getCrawlingSessionHelper(); + final CrawlingInfoHelper crawlingInfoHelper = ComponentUtil.getCrawlingInfoHelper(); boolean completed = false; final int exitCode = Constants.EXIT_OK; try { - writeTimeToSessionInfo(crawlingSessionHelper, Constants.CRAWLER_START_TIME); + writeTimeToSessionInfo(crawlingInfoHelper, Constants.CRAWLER_START_TIME); // setup path mapping final List ptList = new ArrayList<>(); @@ -339,7 +339,7 @@ public class Crawler implements Serializable { } // delete expired sessions - crawlingSessionService.deleteSessionIdsBefore(options.sessionId, options.name, ComponentUtil.getSystemHelper() + crawlingInfoService.deleteSessionIdsBefore(options.sessionId, options.name, ComponentUtil.getSystemHelper() .getCurrentTimeAsLong()); final List webConfigIdList = options.getWebConfigIdList(); @@ -353,9 +353,9 @@ public class Crawler implements Serializable { if (runAll || webConfigIdList != null || fileConfigIdList != null) { webFsCrawlerThread = new Thread((Runnable) () -> { // crawl web - writeTimeToSessionInfo(crawlingSessionHelper, Constants.WEB_FS_CRAWLER_START_TIME); + writeTimeToSessionInfo(crawlingInfoHelper, Constants.WEB_FS_CRAWLER_START_TIME); webFsIndexHelper.crawl(options.sessionId, webConfigIdList, fileConfigIdList); - writeTimeToSessionInfo(crawlingSessionHelper, Constants.WEB_FS_CRAWLER_END_TIME); + writeTimeToSessionInfo(crawlingInfoHelper, Constants.WEB_FS_CRAWLER_END_TIME); }, WEB_FS_CRAWLING_PROCESS); webFsCrawlerThread.start(); } @@ -363,9 +363,9 @@ public class Crawler implements Serializable { if (runAll || dataConfigIdList != null) { dataCrawlerThread = new Thread((Runnable) () -> { // crawl data system - writeTimeToSessionInfo(crawlingSessionHelper, Constants.DATA_CRAWLER_START_TIME); + writeTimeToSessionInfo(crawlingInfoHelper, Constants.DATA_CRAWLER_START_TIME); dataIndexHelper.crawl(options.sessionId, dataConfigIdList); - writeTimeToSessionInfo(crawlingSessionHelper, Constants.DATA_CRAWLER_END_TIME); + writeTimeToSessionInfo(crawlingInfoHelper, Constants.DATA_CRAWLER_END_TIME); }, DATA_CRAWLING_PROCESS); dataCrawlerThread.start(); } @@ -384,17 +384,17 @@ public class Crawler implements Serializable { return Constants.EXIT_FAIL; } finally { pathMappingHelper.removePathMappingList(options.sessionId); - crawlingSessionHelper.putToInfoMap(Constants.CRAWLER_STATUS, completed ? Constants.T.toString() : Constants.F.toString()); - writeTimeToSessionInfo(crawlingSessionHelper, Constants.CRAWLER_END_TIME); - crawlingSessionHelper.putToInfoMap(Constants.CRAWLER_EXEC_TIME, Long.toString(System.currentTimeMillis() - totalTime)); + crawlingInfoHelper.putToInfoMap(Constants.CRAWLER_STATUS, completed ? Constants.T.toString() : Constants.F.toString()); + writeTimeToSessionInfo(crawlingInfoHelper, Constants.CRAWLER_END_TIME); + crawlingInfoHelper.putToInfoMap(Constants.CRAWLER_EXEC_TIME, Long.toString(System.currentTimeMillis() - totalTime)); } } - private void writeTimeToSessionInfo(final CrawlingSessionHelper crawlingSessionHelper, final String key) { - if (crawlingSessionHelper != null) { + private void writeTimeToSessionInfo(final CrawlingInfoHelper crawlingInfoHelper, final String key) { + if (crawlingInfoHelper != null) { final SimpleDateFormat dateFormat = new SimpleDateFormat(CoreLibConstants.DATE_FORMAT_ISO_8601_EXTEND); - crawlingSessionHelper.putToInfoMap(key, dateFormat.format(new Date())); + crawlingInfoHelper.putToInfoMap(key, dateFormat.format(new Date())); } } diff --git a/src/main/java/org/codelibs/fess/helper/CrawlingSessionHelper.java b/src/main/java/org/codelibs/fess/helper/CrawlingInfoHelper.java similarity index 78% rename from src/main/java/org/codelibs/fess/helper/CrawlingSessionHelper.java rename to src/main/java/org/codelibs/fess/helper/CrawlingInfoHelper.java index 85274069e..96cd4e8f9 100644 --- a/src/main/java/org/codelibs/fess/helper/CrawlingSessionHelper.java +++ b/src/main/java/org/codelibs/fess/helper/CrawlingInfoHelper.java @@ -26,11 +26,11 @@ import java.util.Map; import org.codelibs.core.lang.StringUtil; import org.codelibs.fess.Constants; -import org.codelibs.fess.app.service.CrawlingSessionService; +import org.codelibs.fess.app.service.CrawlingInfoService; import org.codelibs.fess.es.client.FessEsClient; import org.codelibs.fess.es.config.exentity.CrawlingConfig; -import org.codelibs.fess.es.config.exentity.CrawlingSession; -import org.codelibs.fess.es.config.exentity.CrawlingSessionInfo; +import org.codelibs.fess.es.config.exentity.CrawlingInfo; +import org.codelibs.fess.es.config.exentity.CrawlingInfoParam; import org.codelibs.fess.exception.FessSystemException; import org.codelibs.fess.mylasta.direction.FessConfig; import org.codelibs.fess.util.ComponentUtil; @@ -44,8 +44,8 @@ import org.lastaflute.di.core.SingletonLaContainer; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -public class CrawlingSessionHelper implements Serializable { - private static final Logger logger = LoggerFactory.getLogger(CrawlingSessionHelper.class); +public class CrawlingInfoHelper implements Serializable { + private static final Logger logger = LoggerFactory.getLogger(CrawlingInfoHelper.class); public static final String FACET_COUNT_KEY = "count"; @@ -57,8 +57,8 @@ public class CrawlingSessionHelper implements Serializable { public int maxSessionIdsInList; - protected CrawlingSessionService getCrawlingSessionService() { - return SingletonLaContainer.getComponent(CrawlingSessionService.class); + protected CrawlingInfoService getCrawlingInfoService() { + return SingletonLaContainer.getComponent(CrawlingInfoService.class); } public String getCanonicalSessionId(final String sessionId) { @@ -70,26 +70,26 @@ public class CrawlingSessionHelper implements Serializable { } public synchronized void store(final String sessionId, final boolean create) { - CrawlingSession crawlingSession = create ? null : getCrawlingSessionService().getLast(sessionId); - if (crawlingSession == null) { - crawlingSession = new CrawlingSession(sessionId); + CrawlingInfo crawlingInfo = create ? null : getCrawlingInfoService().getLast(sessionId); + if (crawlingInfo == null) { + crawlingInfo = new CrawlingInfo(sessionId); try { - getCrawlingSessionService().store(crawlingSession); + getCrawlingInfoService().store(crawlingInfo); } catch (final Exception e) { throw new FessSystemException("No crawling session.", e); } } if (infoMap != null) { - final List crawlingSessionInfoList = new ArrayList(); + final List crawlingInfoParamList = new ArrayList(); for (final Map.Entry entry : infoMap.entrySet()) { - final CrawlingSessionInfo crawlingSessionInfo = new CrawlingSessionInfo(); - crawlingSessionInfo.setCrawlingSessionId(crawlingSession.getId()); - crawlingSessionInfo.setKey(entry.getKey()); - crawlingSessionInfo.setValue(entry.getValue()); - crawlingSessionInfoList.add(crawlingSessionInfo); + final CrawlingInfoParam crawlingInfoParam = new CrawlingInfoParam(); + crawlingInfoParam.setCrawlingInfoId(crawlingInfo.getId()); + crawlingInfoParam.setKey(entry.getKey()); + crawlingInfoParam.setValue(entry.getValue()); + crawlingInfoParamList.add(crawlingInfoParam); } - getCrawlingSessionService().storeInfo(crawlingSessionInfoList); + getCrawlingInfoService().storeInfo(crawlingInfoParamList); } infoMap = null; @@ -103,23 +103,23 @@ public class CrawlingSessionHelper implements Serializable { } public void updateParams(final String sessionId, final String name, final int dayForCleanup) { - final CrawlingSession crawlingSession = getCrawlingSessionService().getLast(sessionId); - if (crawlingSession == null) { + final CrawlingInfo crawlingInfo = getCrawlingInfoService().getLast(sessionId); + if (crawlingInfo == null) { logger.warn("No crawling session: " + sessionId); return; } if (StringUtil.isNotBlank(name)) { - crawlingSession.setName(name); + crawlingInfo.setName(name); } else { - crawlingSession.setName(Constants.CRAWLING_SESSION_SYSTEM_NAME); + crawlingInfo.setName(Constants.CRAWLING_INFO_SYSTEM_NAME); } if (dayForCleanup >= 0) { final long expires = getExpiredTime(dayForCleanup); - crawlingSession.setExpiredTime(expires); + crawlingInfo.setExpiredTime(expires); documentExpires = expires; } try { - getCrawlingSessionService().store(crawlingSession); + getCrawlingInfoService().store(crawlingInfo); } catch (final Exception e) { throw new FessSystemException("No crawling session.", e); } @@ -142,10 +142,10 @@ public class CrawlingSessionHelper implements Serializable { } public Map getInfoMap(final String sessionId) { - final List crawlingSessionInfoList = getCrawlingSessionService().getLastCrawlingSessionInfoList(sessionId); + final List crawlingInfoParamList = getCrawlingInfoService().getLastCrawlingInfoParamList(sessionId); final Map map = new HashMap(); - for (final CrawlingSessionInfo crawlingSessionInfo : crawlingSessionInfoList) { - map.put(crawlingSessionInfo.getKey(), crawlingSessionInfo.getValue()); + for (final CrawlingInfoParam crawlingInfoParam : crawlingInfoParamList) { + map.put(crawlingInfoParam.getKey(), crawlingInfoParam.getValue()); } return map; } diff --git a/src/main/java/org/codelibs/fess/helper/DataIndexHelper.java b/src/main/java/org/codelibs/fess/helper/DataIndexHelper.java index a8a57f66f..d870539c0 100644 --- a/src/main/java/org/codelibs/fess/helper/DataIndexHelper.java +++ b/src/main/java/org/codelibs/fess/helper/DataIndexHelper.java @@ -113,7 +113,7 @@ public class DataIndexHelper implements Serializable { sessionIdList.add(sid); initParamMap.put(Constants.SESSION_ID, sessionId); - initParamMap.put(Constants.CRAWLING_SESSION_ID, sid); + initParamMap.put(Constants.CRAWLING_INFO_ID, sid); final DataCrawlingThread dataCrawlingThread = new DataCrawlingThread(dataConfig, indexUpdateCallback, initParamMap); dataCrawlingThread.setPriority(crawlerPriority); @@ -184,16 +184,16 @@ public class DataIndexHelper implements Serializable { dataCrawlingThreadStatusList.clear(); // put cralwing info - final CrawlingSessionHelper crawlingSessionHelper = ComponentUtil.getCrawlingSessionHelper(); + final CrawlingInfoHelper crawlingInfoHelper = ComponentUtil.getCrawlingInfoHelper(); final long execTime = System.currentTimeMillis() - startTime; - crawlingSessionHelper.putToInfoMap(Constants.DATA_CRAWLING_EXEC_TIME, Long.toString(execTime)); + crawlingInfoHelper.putToInfoMap(Constants.DATA_CRAWLING_EXEC_TIME, Long.toString(execTime)); if (logger.isInfoEnabled()) { logger.info("[EXEC TIME] crawling time: " + execTime + "ms"); } - crawlingSessionHelper.putToInfoMap(Constants.DATA_INDEX_EXEC_TIME, Long.toString(indexUpdateCallback.getExecuteTime())); - crawlingSessionHelper.putToInfoMap(Constants.DATA_INDEX_SIZE, Long.toString(indexUpdateCallback.getDocumentSize())); + crawlingInfoHelper.putToInfoMap(Constants.DATA_INDEX_EXEC_TIME, Long.toString(indexUpdateCallback.getExecuteTime())); + crawlingInfoHelper.putToInfoMap(Constants.DATA_INDEX_SIZE, Long.toString(indexUpdateCallback.getDocumentSize())); for (final String sid : sessionIdList) { // remove config @@ -275,8 +275,8 @@ public class DataIndexHelper implements Serializable { } } - public String getCrawlingSessionId() { - return initParamMap.get(Constants.CRAWLING_SESSION_ID); + public String getCrawlingInfoId() { + return initParamMap.get(Constants.CRAWLING_INFO_ID); } public boolean isRunning() { diff --git a/src/main/java/org/codelibs/fess/helper/WebFsIndexHelper.java b/src/main/java/org/codelibs/fess/helper/WebFsIndexHelper.java index 4c0202a21..783ea5f07 100644 --- a/src/main/java/org/codelibs/fess/helper/WebFsIndexHelper.java +++ b/src/main/java/org/codelibs/fess/helper/WebFsIndexHelper.java @@ -451,10 +451,10 @@ public class WebFsIndexHelper implements Serializable { crawlerStatusList.clear(); // put cralwing info - final CrawlingSessionHelper crawlingSessionHelper = ComponentUtil.getCrawlingSessionHelper(); + final CrawlingInfoHelper crawlingInfoHelper = ComponentUtil.getCrawlingInfoHelper(); final long execTime = System.currentTimeMillis() - startTime; - crawlingSessionHelper.putToInfoMap(Constants.WEB_FS_CRAWLING_EXEC_TIME, Long.toString(execTime)); + crawlingInfoHelper.putToInfoMap(Constants.WEB_FS_CRAWLING_EXEC_TIME, Long.toString(execTime)); if (logger.isInfoEnabled()) { logger.info("[EXEC TIME] crawling time: " + execTime + "ms"); } @@ -466,8 +466,8 @@ public class WebFsIndexHelper implements Serializable { logger.warn("Interrupted index update.", e); } - crawlingSessionHelper.putToInfoMap(Constants.WEB_FS_INDEX_EXEC_TIME, Long.toString(indexUpdater.getExecuteTime())); - crawlingSessionHelper.putToInfoMap(Constants.WEB_FS_INDEX_SIZE, Long.toString(indexUpdater.getDocumentSize())); + crawlingInfoHelper.putToInfoMap(Constants.WEB_FS_INDEX_EXEC_TIME, Long.toString(indexUpdater.getExecuteTime())); + crawlingInfoHelper.putToInfoMap(Constants.WEB_FS_INDEX_SIZE, Long.toString(indexUpdater.getDocumentSize())); for (final String sid : sessionIdList) { // remove config diff --git a/src/main/java/org/codelibs/fess/job/CrawlJob.java b/src/main/java/org/codelibs/fess/job/CrawlJob.java index 4aad61014..8df887509 100644 --- a/src/main/java/org/codelibs/fess/job/CrawlJob.java +++ b/src/main/java/org/codelibs/fess/job/CrawlJob.java @@ -46,7 +46,7 @@ public class CrawlJob { protected String sessionId; - protected String namespace = Constants.CRAWLING_SESSION_SYSTEM_NAME; + protected String namespace = Constants.CRAWLING_INFO_SYSTEM_NAME; protected String[] webConfigIds; diff --git a/src/main/java/org/codelibs/fess/job/PurgeLogJob.java b/src/main/java/org/codelibs/fess/job/PurgeLogJob.java index 66431bc2a..99b6d8e62 100644 --- a/src/main/java/org/codelibs/fess/job/PurgeLogJob.java +++ b/src/main/java/org/codelibs/fess/job/PurgeLogJob.java @@ -17,7 +17,7 @@ package org.codelibs.fess.job; import org.codelibs.core.misc.DynamicProperties; import org.codelibs.fess.Constants; -import org.codelibs.fess.app.service.CrawlingSessionService; +import org.codelibs.fess.app.service.CrawlingInfoService; import org.codelibs.fess.app.service.JobLogService; import org.codelibs.fess.app.service.SearchLogService; import org.codelibs.fess.app.service.UserInfoService; @@ -31,7 +31,7 @@ public class PurgeLogJob { private static final Logger logger = LoggerFactory.getLogger(PurgeLogJob.class); public String execute() { - final CrawlingSessionService crawlingSessionService = ComponentUtil.getComponent(CrawlingSessionService.class); + final CrawlingInfoService crawlingInfoService = ComponentUtil.getComponent(CrawlingInfoService.class); final SearchLogService searchLogService = ComponentUtil.getComponent(SearchLogService.class); final JobLogService jobLogService = ComponentUtil.getComponent(JobLogService.class); final UserInfoService userInfoService = ComponentUtil.getComponent(UserInfoService.class); @@ -42,7 +42,7 @@ public class PurgeLogJob { // purge crawling sessions try { - crawlingSessionService.deleteBefore(systemHelper.getCurrentTimeAsLong()); + crawlingInfoService.deleteBefore(systemHelper.getCurrentTimeAsLong()); } catch (final Exception e) { logger.error("Failed to purge crawling sessions.", e); resultBuf.append(e.getMessage()).append("\n"); diff --git a/src/main/java/org/codelibs/fess/mylasta/action/FessLabels.java b/src/main/java/org/codelibs/fess/mylasta/action/FessLabels.java index c4e60c819..85074ed38 100644 --- a/src/main/java/org/codelibs/fess/mylasta/action/FessLabels.java +++ b/src/main/java/org/codelibs/fess/mylasta/action/FessLabels.java @@ -1092,91 +1092,91 @@ public class FessLabels extends ActionMessages { public static final String LABELS_purge_suggest_search_log_day = "{labels.purge_suggest_search_log_day}"; /** The key of the message: Crawling Information */ - public static final String LABELS_crawling_session_title = "{labels.crawling_session_title}"; + public static final String LABELS_crawling_info_title = "{labels.crawling_info_title}"; /** The key of the message: Crawling Information */ - public static final String LABELS_crawling_session_title_confirm = "{labels.crawling_session_title_confirm}"; + public static final String LABELS_crawling_info_title_confirm = "{labels.crawling_info_title_confirm}"; /** The key of the message: Back */ - public static final String LABELS_crawling_session_button_back = "{labels.crawling_session_button_back}"; + public static final String LABELS_crawling_info_button_back = "{labels.crawling_info_button_back}"; /** The key of the message: Delete */ - public static final String LABELS_crawling_session_button_delete = "{labels.crawling_session_button_delete}"; + public static final String LABELS_crawling_info_button_delete = "{labels.crawling_info_button_delete}"; /** The key of the message: Crawling Info */ - public static final String LABELS_crawling_session_configuration = "{labels.crawling_session_configuration}"; + public static final String LABELS_crawling_info_configuration = "{labels.crawling_info_configuration}"; /** The key of the message: Search */ - public static final String LABELS_crawling_session_search = "{labels.crawling_session_search}"; + public static final String LABELS_crawling_info_search = "{labels.crawling_info_search}"; /** The key of the message: Reset */ - public static final String LABELS_crawling_session_reset = "{labels.crawling_session_reset}"; + public static final String LABELS_crawling_info_reset = "{labels.crawling_info_reset}"; /** The key of the message: Crawling Information */ - public static final String LABELS_crawling_session_link_top = "{labels.crawling_session_link_top}"; + public static final String LABELS_crawling_info_link_top = "{labels.crawling_info_link_top}"; /** The key of the message: Details */ - public static final String LABELS_crawling_session_link_details = "{labels.crawling_session_link_details}"; + public static final String LABELS_crawling_info_link_details = "{labels.crawling_info_link_details}"; /** The key of the message: Session ID */ - public static final String LABELS_crawling_session_session_id_search = "{labels.crawling_session_session_id_search}"; + public static final String LABELS_crawling_info_session_id_search = "{labels.crawling_info_session_id_search}"; /** The key of the message: Session ID */ - public static final String LABELS_crawling_session_session_id = "{labels.crawling_session_session_id}"; + public static final String LABELS_crawling_info_session_id = "{labels.crawling_info_session_id}"; /** The key of the message: Created */ - public static final String LABELS_crawling_session_created_time = "{labels.crawling_session_created_time}"; + public static final String LABELS_crawling_info_created_time = "{labels.crawling_info_created_time}"; /** The key of the message: Delete All */ - public static final String LABELS_crawling_session_delete_all_link = "{labels.crawling_session_delete_all_link}"; + public static final String LABELS_crawling_info_delete_all_link = "{labels.crawling_info_delete_all_link}"; /** The key of the message: Do you really want to delete all? */ - public static final String LABELS_crawling_session_delete_all_confirmation = "{labels.crawling_session_delete_all_confirmation}"; + public static final String LABELS_crawling_info_delete_all_confirmation = "{labels.crawling_info_delete_all_confirmation}"; /** The key of the message: Cancel */ - public static final String LABELS_crawling_session_delete_all_cancel = "{labels.crawling_session_delete_all_cancel}"; + public static final String LABELS_crawling_info_delete_all_cancel = "{labels.crawling_info_delete_all_cancel}"; /** The key of the message: Crawler start time */ - public static final String LABELS_crawling_session_CrawlerStartTime = "{labels.crawling_session_CrawlerStartTime}"; + public static final String LABELS_crawling_info_CrawlerStartTime = "{labels.crawling_info_CrawlerStartTime}"; /** The key of the message: Crawler end time */ - public static final String LABELS_crawling_session_CrawlerEndTime = "{labels.crawling_session_CrawlerEndTime}"; + public static final String LABELS_crawling_info_CrawlerEndTime = "{labels.crawling_info_CrawlerEndTime}"; /** The key of the message: Crawler exec time */ - public static final String LABELS_crawling_session_CrawlerExecTime = "{labels.crawling_session_CrawlerExecTime}"; + public static final String LABELS_crawling_info_CrawlerExecTime = "{labels.crawling_info_CrawlerExecTime}"; /** The key of the message: Crawler status */ - public static final String LABELS_crawling_session_CrawlerStatus = "{labels.crawling_session_CrawlerStatus}"; + public static final String LABELS_crawling_info_CrawlerStatus = "{labels.crawling_info_CrawlerStatus}"; /** The key of the message: Crawl exec time (Web/File system) */ - public static final String LABELS_crawling_session_WebFsCrawlExecTime = "{labels.crawling_session_WebFsCrawlExecTime}"; + public static final String LABELS_crawling_info_WebFsCrawlExecTime = "{labels.crawling_info_WebFsCrawlExecTime}"; /** The key of the message: Crawl start time (Web/File system) */ - public static final String LABELS_crawling_session_WebFsCrawlStartTime = "{labels.crawling_session_WebFsCrawlStartTime}"; + public static final String LABELS_crawling_info_WebFsCrawlStartTime = "{labels.crawling_info_WebFsCrawlStartTime}"; /** The key of the message: Crawl end time (Web/File system) */ - public static final String LABELS_crawling_session_WebFsCrawlEndTime = "{labels.crawling_session_WebFsCrawlEndTime}"; + public static final String LABELS_crawling_info_WebFsCrawlEndTime = "{labels.crawling_info_WebFsCrawlEndTime}"; /** The key of the message: Index exec time (Web/File system) */ - public static final String LABELS_crawling_session_WebFsIndexExecTime = "{labels.crawling_session_WebFsIndexExecTime}"; + public static final String LABELS_crawling_info_WebFsIndexExecTime = "{labels.crawling_info_WebFsIndexExecTime}"; /** The key of the message: Index size (Web/File system) */ - public static final String LABELS_crawling_session_WebFsIndexSize = "{labels.crawling_session_WebFsIndexSize}"; + public static final String LABELS_crawling_info_WebFsIndexSize = "{labels.crawling_info_WebFsIndexSize}"; /** The key of the message: Crawl exec time (Data store) */ - public static final String LABELS_crawling_session_DataCrawlExecTime = "{labels.crawling_session_DataCrawlExecTime}"; + public static final String LABELS_crawling_info_DataCrawlExecTime = "{labels.crawling_info_DataCrawlExecTime}"; /** The key of the message: Crawl start time (Data store) */ - public static final String LABELS_crawling_session_DataCrawlStartTime = "{labels.crawling_session_DataCrawlStartTime}"; + public static final String LABELS_crawling_info_DataCrawlStartTime = "{labels.crawling_info_DataCrawlStartTime}"; /** The key of the message: Crawl end time (Data store) */ - public static final String LABELS_crawling_session_DataCrawlEndTime = "{labels.crawling_session_DataCrawlEndTime}"; + public static final String LABELS_crawling_info_DataCrawlEndTime = "{labels.crawling_info_DataCrawlEndTime}"; /** The key of the message: Index exec time (Data store) */ - public static final String LABELS_crawling_session_DataIndexExecTime = "{labels.crawling_session_DataIndexExecTime}"; + public static final String LABELS_crawling_info_DataIndexExecTime = "{labels.crawling_info_DataIndexExecTime}"; /** The key of the message: Index size (Data store) */ - public static final String LABELS_crawling_session_DataIndexSize = "{labels.crawling_session_DataIndexSize}"; + public static final String LABELS_crawling_info_DataIndexSize = "{labels.crawling_info_DataIndexSize}"; /** The key of the message: Web Authentication */ public static final String LABELS_webauth_configuration = "{labels.webauth_configuration}"; @@ -1578,8 +1578,7 @@ public class FessLabels extends ActionMessages { public static final String LABELS_system_info_bug_report_title = "{labels.system_info_bug_report_title}"; /** The key of the message: crawler.properties does not exist. Default values are applied. */ - public static final String LABELS_system_info_crawler_properties_does_not_exist = - "{labels.system_info_crawler_properties_does_not_exist}"; + public static final String LABELS_system_info_crawler_properties_does_not_exist = "{labels.system_info_crawler_properties_does_not_exist}"; /** The key of the message: File Authentication */ public static final String LABELS_file_auth_configuration = "{labels.file_auth_configuration}"; diff --git a/src/main/java/org/codelibs/fess/mylasta/action/FessMessages.java b/src/main/java/org/codelibs/fess/mylasta/action/FessMessages.java index 9dc5b651b..67fadd90e 100644 --- a/src/main/java/org/codelibs/fess/mylasta/action/FessMessages.java +++ b/src/main/java/org/codelibs/fess/mylasta/action/FessMessages.java @@ -15,6 +15,7 @@ */ package org.codelibs.fess.mylasta.action; +import org.codelibs.fess.mylasta.action.FessLabels; import org.lastaflute.web.ruts.message.ActionMessage; /** @@ -294,7 +295,7 @@ public class FessMessages extends FessLabels { public static final String SUCCESS_delete_doc_from_index = "{success.delete_doc_from_index}"; /** The key of the message: Deleted session data. */ - public static final String SUCCESS_crawling_session_delete_all = "{success.crawling_session_delete_all}"; + public static final String SUCCESS_crawling_info_delete_all = "{success.crawling_info_delete_all}"; /** The key of the message: Started a crawl process. */ public static final String SUCCESS_start_crawl_process = "{success.start_crawl_process}"; @@ -1660,16 +1661,16 @@ public class FessMessages extends FessLabels { } /** - * Add the created action message for the key 'success.crawling_session_delete_all' with parameters. + * Add the created action message for the key 'success.crawling_info_delete_all' with parameters. * 
      * message: Deleted session data.
      *
* @param property The property name for the message. (NotNull) * @return this. (NotNull) */ - public FessMessages addSuccessCrawlingSessionDeleteAll(String property) { + public FessMessages addSuccessCrawlingInfoDeleteAll(String property) { assertPropertyNotNull(property); - add(property, new ActionMessage(SUCCESS_crawling_session_delete_all)); + add(property, new ActionMessage(SUCCESS_crawling_info_delete_all)); return this; } diff --git a/src/main/java/org/codelibs/fess/mylasta/direction/FessConfig.java b/src/main/java/org/codelibs/fess/mylasta/direction/FessConfig.java index 3306b2973..55538676c 100644 --- a/src/main/java/org/codelibs/fess/mylasta/direction/FessConfig.java +++ b/src/main/java/org/codelibs/fess/mylasta/direction/FessConfig.java @@ -15,6 +15,7 @@ */ package org.codelibs.fess.mylasta.direction; +import org.codelibs.fess.mylasta.direction.FessEnv; import org.lastaflute.core.direction.exception.ConfigPropertyNotFoundException; /** diff --git a/src/main/java/org/codelibs/fess/mylasta/mail/CrawlerPostcard.java b/src/main/java/org/codelibs/fess/mylasta/mail/CrawlerPostcard.java index 24ec317b4..60cedfd99 100644 --- a/src/main/java/org/codelibs/fess/mylasta/mail/CrawlerPostcard.java +++ b/src/main/java/org/codelibs/fess/mylasta/mail/CrawlerPostcard.java @@ -50,10 +50,7 @@ public class CrawlerPostcard extends LaTypicalPostcard { @Override protected String[] getPropertyNames() { - return new String[] { "hostname", "webFsCrawlStartTime", "webFsCrawlEndTime", "webFsCrawlExecTime", "webFsIndexExecTime", - "webFsIndexSize", "dataCrawlStartTime", "dataCrawlEndTime", "dataCrawlExecTime", "dataIndexExecTime", "dataFsIndexSize", - "commitStartTime", "commitEndTime", "commitExecTime", "optimizeStartTime", "optimizeEndTime", "optimizeExecTime", - "crawlerStartTime", "crawlerEndTime", "crawlerExecTime" }; + return new String[] {"hostname", "webFsCrawlStartTime", "webFsCrawlEndTime", "webFsCrawlExecTime", "webFsIndexExecTime", "webFsIndexSize", "dataCrawlStartTime", "dataCrawlEndTime", "dataCrawlExecTime", "dataIndexExecTime", "dataFsIndexSize", "commitStartTime", "commitEndTime", "commitExecTime", "optimizeStartTime", "optimizeEndTime", "optimizeExecTime", "crawlerStartTime", "crawlerEndTime", "crawlerExecTime"}; } // =================================================================================== diff --git a/src/main/java/org/codelibs/fess/mylasta/mail/EsStatusPostcard.java b/src/main/java/org/codelibs/fess/mylasta/mail/EsStatusPostcard.java index fc71324b4..f3a842b34 100644 --- a/src/main/java/org/codelibs/fess/mylasta/mail/EsStatusPostcard.java +++ b/src/main/java/org/codelibs/fess/mylasta/mail/EsStatusPostcard.java @@ -50,7 +50,7 @@ public class EsStatusPostcard extends LaTypicalPostcard { @Override protected String[] getPropertyNames() { - return new String[] { "hostname", "server", "statusBefore", "statusAfter", "indexBefore", "indexAfter" }; + return new String[] {"hostname", "server", "statusBefore", "statusAfter", "indexBefore", "indexAfter"}; } // =================================================================================== diff --git a/src/main/java/org/codelibs/fess/util/ComponentUtil.java b/src/main/java/org/codelibs/fess/util/ComponentUtil.java index 8d6561625..8761f53c5 100644 --- a/src/main/java/org/codelibs/fess/util/ComponentUtil.java +++ b/src/main/java/org/codelibs/fess/util/ComponentUtil.java @@ -26,7 +26,7 @@ import org.codelibs.fess.ds.DataStoreFactory; import org.codelibs.fess.es.client.FessEsClient; import org.codelibs.fess.helper.AdRoleHelper; import org.codelibs.fess.helper.CrawlingConfigHelper; -import org.codelibs.fess.helper.CrawlingSessionHelper; +import org.codelibs.fess.helper.CrawlingInfoHelper; import org.codelibs.fess.helper.DuplicateHostHelper; import org.codelibs.fess.helper.FileTypeHelper; import org.codelibs.fess.helper.HotSearchWordHelper; @@ -86,7 +86,7 @@ public final class ComponentUtil { private static final String HOT_SEARCH_WORD_HELPER = "hotSearchWordHelper"; - private static final String CRAWLING_SESSION_HELPER = "crawlingSessionHelper"; + private static final String CRAWLING_INFO_HELPER = "crawlingInfoHelper"; private static final String CRAWLING_CONFIG_HELPER = "crawlingConfigHelper"; @@ -165,8 +165,8 @@ public final class ComponentUtil { return SingletonLaContainer.getComponent(CRAWLING_CONFIG_HELPER); } - public static CrawlingSessionHelper getCrawlingSessionHelper() { - return SingletonLaContainer.getComponent(CRAWLING_SESSION_HELPER); + public static CrawlingInfoHelper getCrawlingInfoHelper() { + return SingletonLaContainer.getComponent(CRAWLING_INFO_HELPER); } public static HotSearchWordHelper getHotSearchWordHelper() { diff --git a/src/main/resources/esclient.xml b/src/main/resources/esclient.xml index f5752707b..11c612349 100644 --- a/src/main/resources/esclient.xml +++ b/src/main/resources/esclient.xml @@ -31,10 +31,10 @@ ".fess_config/boost_document_rule" - ".fess_config/crawling_session" + ".fess_config/crawling_info" - ".fess_config/crawling_session_info" + ".fess_config/crawling_info_param" ".fess_config/data_config" diff --git a/src/main/resources/esflute_config.xml b/src/main/resources/esflute_config.xml index 2c6ec6aba..b9a5f9fd8 100644 --- a/src/main/resources/esflute_config.xml +++ b/src/main/resources/esflute_config.xml @@ -6,8 +6,8 @@ - - + + diff --git a/src/main/resources/fess.xml b/src/main/resources/fess.xml index 918881ec8..a9f684df1 100644 --- a/src/main/resources/fess.xml +++ b/src/main/resources/fess.xml @@ -114,7 +114,7 @@ "cache.hbs" - + diff --git a/src/main/resources/fess_indices/.fess_config/crawling_session.json b/src/main/resources/fess_indices/.fess_config/crawling_info.json similarity index 94% rename from src/main/resources/fess_indices/.fess_config/crawling_session.json rename to src/main/resources/fess_indices/.fess_config/crawling_info.json index cd1883923..f3b418090 100644 --- a/src/main/resources/fess_indices/.fess_config/crawling_session.json +++ b/src/main/resources/fess_indices/.fess_config/crawling_info.json @@ -1,5 +1,5 @@ { - "crawling_session": { + "crawling_info": { "_source": { "enabled": true }, diff --git a/src/main/resources/fess_indices/.fess_config/crawling_session_info.json b/src/main/resources/fess_indices/.fess_config/crawling_info_param.json similarity index 87% rename from src/main/resources/fess_indices/.fess_config/crawling_session_info.json rename to src/main/resources/fess_indices/.fess_config/crawling_info_param.json index 57396b5db..d0d018c93 100644 --- a/src/main/resources/fess_indices/.fess_config/crawling_session_info.json +++ b/src/main/resources/fess_indices/.fess_config/crawling_info_param.json @@ -1,5 +1,5 @@ { - "crawling_session_info": { + "crawling_info_param": { "_source": { "enabled": true }, @@ -7,7 +7,7 @@ "enabled": false }, "properties": { - "crawlingSessionId": { + "crawlingInfoId": { "type": "string", "index": "not_analyzed" }, diff --git a/src/main/resources/fess_label.properties b/src/main/resources/fess_label.properties index 6eb099f89..48eb0fcae 100644 --- a/src/main/resources/fess_label.properties +++ b/src/main/resources/fess_label.properties @@ -361,35 +361,35 @@ labels.duplicate_host_title_details=Duplicate Host labels.dashboard_title_configuration=System Configuration labels.suggest_search_log_enabled=Suggest by Search Words labels.purge_suggest_search_log_day=Purge Suggest Docs by Search Words -labels.crawling_session_title=Crawling Information -labels.crawling_session_title_confirm=Crawling Information -labels.crawling_session_button_back=Back -labels.crawling_session_button_delete=Delete -labels.crawling_session_configuration=Crawling Info -labels.crawling_session_search=Search -labels.crawling_session_reset=Reset -labels.crawling_session_link_top=Crawling Information -labels.crawling_session_link_details=Details -labels.crawling_session_session_id_search=Session ID -labels.crawling_session_session_id=Session ID -labels.crawling_session_created_time=Created -labels.crawling_session_delete_all_link=Delete All -labels.crawling_session_delete_all_confirmation=Do you really want to delete all? -labels.crawling_session_delete_all_cancel=Cancel -labels.crawling_session_CrawlerStartTime=Crawler start time -labels.crawling_session_CrawlerEndTime=Crawler end time -labels.crawling_session_CrawlerExecTime=Crawler exec time -labels.crawling_session_CrawlerStatus=Crawler status -labels.crawling_session_WebFsCrawlExecTime=Crawl exec time (Web/File system) -labels.crawling_session_WebFsCrawlStartTime=Crawl start time (Web/File system) -labels.crawling_session_WebFsCrawlEndTime=Crawl end time (Web/File system) -labels.crawling_session_WebFsIndexExecTime=Index exec time (Web/File system) -labels.crawling_session_WebFsIndexSize=Index size (Web/File system) -labels.crawling_session_DataCrawlExecTime=Crawl exec time (Data store) -labels.crawling_session_DataCrawlStartTime=Crawl start time (Data store) -labels.crawling_session_DataCrawlEndTime=Crawl end time (Data store) -labels.crawling_session_DataIndexExecTime=Index exec time (Data store) -labels.crawling_session_DataIndexSize=Index size (Data store) +labels.crawling_info_title=Crawling Information +labels.crawling_info_title_confirm=Crawling Information +labels.crawling_info_button_back=Back +labels.crawling_info_button_delete=Delete +labels.crawling_info_configuration=Crawling Info +labels.crawling_info_search=Search +labels.crawling_info_reset=Reset +labels.crawling_info_link_top=Crawling Information +labels.crawling_info_link_details=Details +labels.crawling_info_session_id_search=Session ID +labels.crawling_info_session_id=Session ID +labels.crawling_info_created_time=Created +labels.crawling_info_delete_all_link=Delete All +labels.crawling_info_delete_all_confirmation=Do you really want to delete all? +labels.crawling_info_delete_all_cancel=Cancel +labels.crawling_info_CrawlerStartTime=Crawler start time +labels.crawling_info_CrawlerEndTime=Crawler end time +labels.crawling_info_CrawlerExecTime=Crawler exec time +labels.crawling_info_CrawlerStatus=Crawler status +labels.crawling_info_WebFsCrawlExecTime=Crawl exec time (Web/File system) +labels.crawling_info_WebFsCrawlStartTime=Crawl start time (Web/File system) +labels.crawling_info_WebFsCrawlEndTime=Crawl end time (Web/File system) +labels.crawling_info_WebFsIndexExecTime=Index exec time (Web/File system) +labels.crawling_info_WebFsIndexSize=Index size (Web/File system) +labels.crawling_info_DataCrawlExecTime=Crawl exec time (Data store) +labels.crawling_info_DataCrawlStartTime=Crawl start time (Data store) +labels.crawling_info_DataCrawlEndTime=Crawl end time (Data store) +labels.crawling_info_DataIndexExecTime=Index exec time (Data store) +labels.crawling_info_DataIndexSize=Index size (Data store) labels.webauth_configuration=Web Authentication labels.webauth_list_hostname=Hostname labels.webauth_list_web_crawling_config=Config Name diff --git a/src/main/resources/fess_message.properties b/src/main/resources/fess_message.properties index b04b8a21c..4ee846335 100644 --- a/src/main/resources/fess_message.properties +++ b/src/main/resources/fess_message.properties @@ -122,7 +122,7 @@ errors.crud_could_not_find_crud_table=Could not find the data({0}). success.update_crawler_params=Updated parameters. success.delete_doc_from_index=Started a process to delete the document from index. -success.crawling_session_delete_all=Deleted session data. +success.crawling_info_delete_all=Deleted session data. success.start_crawl_process=Started a crawl process. success.upload_design_file=Uploaded {0}. success.update_design_jsp_file=Updated {0}. diff --git a/src/main/webapp/WEB-INF/view/admin/crawlinginfo/admin_crawlinginfo.jsp b/src/main/webapp/WEB-INF/view/admin/crawlinginfo/admin_crawlinginfo.jsp index 1b663270c..e2e802608 100644 --- a/src/main/webapp/WEB-INF/view/admin/crawlinginfo/admin_crawlinginfo.jsp +++ b/src/main/webapp/WEB-INF/view/admin/crawlinginfo/admin_crawlinginfo.jsp @@ -3,7 +3,7 @@ <la:message key="labels.admin_brand_title" /> | <la:message - key="labels.crawling_session_configuration" /> + key="labels.crawling_info_configuration" /> @@ -11,16 +11,16 @@ - +

- +

  1. - +
@@ -30,7 +30,7 @@

- +

@@ -48,7 +48,7 @@ action="/admin/crawlinginfo/">
- + @@ -56,20 +56,20 @@
<%-- List --%> - +
@@ -77,21 +77,21 @@
- +
+ key="labels.crawling_info_session_id" /> + key="labels.crawling_info_created_time" /> + items="${crawlingInfoItems}"> @@ -104,7 +104,7 @@
${f:h(data.sessionId)}
-
@@ -113,7 +113,7 @@

+ key="labels.crawling_info_delete_all_confirmation" />

diff --git a/src/main/webapp/WEB-INF/view/admin/crawlinginfo/admin_crawlinginfo_details.jsp b/src/main/webapp/WEB-INF/view/admin/crawlinginfo/admin_crawlinginfo_details.jsp index e4c81cc19..8d8224556 100644 --- a/src/main/webapp/WEB-INF/view/admin/crawlinginfo/admin_crawlinginfo_details.jsp +++ b/src/main/webapp/WEB-INF/view/admin/crawlinginfo/admin_crawlinginfo_details.jsp @@ -3,7 +3,7 @@ <la:message key="labels.admin_brand_title" /> | <la:message - key="labels.crawling_session_configuration" /> + key="labels.crawling_info_configuration" /> @@ -11,20 +11,20 @@ - +

- +

  1. - +
    3. + key="labels.crawling_info_link_details" />
@@ -41,22 +41,22 @@

- + - + - + - +

- +
@@ -74,12 +74,12 @@ + key="labels.crawling_info_session_id" /> ${f:h(sessionId)} - + ${f:h(info.keyMsg)} ${f:h(info.value)} @@ -92,15 +92,15 @@