Merge pull request #343 from kw-udon/renaming

Renaming

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
         },

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
 

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;

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();
     }
 

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();
     }
 

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();
     }
 

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();
     }
 

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();
     }
 

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();
     }
 

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<BoostDocumentRule> getBoostDocumentRuleList(final BoostDocumentRulePager boostDocumentRulePager) {
+    public List<BoostDocumentRule> getBoostDocumentRuleList(final BoostDocPager boostDocumentRulePager) {
 
         final PagingResultBean<BoostDocumentRule> 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);
         }

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<CrawlingSession> getCrawlingSessionList(final CrawlingSessionPager crawlingSessionPager) {
+    public List<CrawlingInfo> getCrawlingInfoList(final CrawlingInfoPager crawlingInfoPager) {
 
-        final PagingResultBean<CrawlingSession> crawlingSessionList = crawlingSessionBhv.selectPage(cb -> {
-            cb.paging(crawlingSessionPager.getPageSize(), crawlingSessionPager.getCurrentPageNumber());
-            setupListCondition(cb, crawlingSessionPager);
+        final PagingResultBean<CrawlingInfo> 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<CrawlingSession> getCrawlingSession(final String id) {
-        return crawlingSessionBhv.selectByPK(id);
+    public OptionalEntity<CrawlingInfo> 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<String, String> keys) {
+    protected void setupEntityCondition(final CrawlingInfoCB cb, final Map<String, String> 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<CrawlingSession> crawlingSessionList = crawlingSessionBhv.selectList(cb -> {
+        final List<CrawlingInfo> 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<String> crawlingSessionIdList = new ArrayList<>();
-            for (final CrawlingSession cs : crawlingSessionList) {
-                crawlingSessionIdList.add(cs.getId());
+        if (!crawlingInfoList.isEmpty()) {
+            final List<String> 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<CrawlingSessionInfo> crawlingSessionInfoList) {
-        if (crawlingSessionInfoList == null) {
+    public void storeInfo(final List<CrawlingInfoParam> 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<CrawlingSessionInfo> getCrawlingSessionInfoList(final String id) {
-        return crawlingSessionInfoBhv.selectList(cb -> {
-            cb.query().setCrawlingSessionId_Equal(id);
+    public List<CrawlingInfoParam> getCrawlingInfoParamList(final String id) {
+        return crawlingInfoParamBhv.selectList(cb -> {
+            cb.query().setCrawlingInfoId_Equal(id);
             cb.query().addOrderBy_Id_Asc();
         });
     }
 
-    public List<CrawlingSessionInfo> getLastCrawlingSessionInfoList(final String sessionId) {
-        final CrawlingSession crawlingSession = getLast(sessionId);
-        if (crawlingSession == null) {
+    public List<CrawlingInfoParam> 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<String> activeSessionId) {
-        final List<CrawlingSession> activeSessionList =
-                activeSessionId.isEmpty() ? Collections.emptyList() : crawlingSessionBhv.selectList(cb -> {
+        final List<CrawlingInfo> activeSessionList =
+                activeSessionId.isEmpty() ? Collections.emptyList() : crawlingInfoBhv.selectList(cb -> {
                     cb.query().setSessionId_InScope(activeSessionId);
                     cb.specify().columnId();
                 });
         final List<String> 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<CrawlingSessionInfo>() {
+            }, new EntityRowHandler<CrawlingInfoParam>() {
                 @Override
-                public void handle(final CrawlingSessionInfo entity) {
+                public void handle(final CrawlingInfoParam entity) {
                     final List<String> list = new ArrayList<String>();
-                    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<String> 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<CrawlingSession> list = crawlingSessionBhv.selectList(cb -> {
+    public CrawlingInfo getLast(final String sessionId) {
+        final ListResultBean<CrawlingInfo> list = crawlingInfoBhv.selectList(cb -> {
             cb.query().setSessionId_Equal(sessionId);
             cb.query().addOrderBy_CreatedTime_Desc();
             cb.fetchFirst(1);

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<FileAuthentication> getFileAuthenticationList(final FileAuthenticationPager fileAuthenticationPager) {
+    public List<FileAuthentication> getFileAuthenticationList(final FileAuthPager fileAuthenticationPager) {
 
         final PagingResultBean<FileAuthentication> 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);
         }

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<PathMapping> getPathMappingList(final PathMappingPager pathMappingPager) {
+    public List<PathMapping> getPathMappingList(final PathMapPager pathMappingPager) {
 
         final PagingResultBean<PathMapping> 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);
         }

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<RequestHeader> getRequestHeaderList(final RequestHeaderPager requestHeaderPager) {
+    public List<RequestHeader> getRequestHeaderList(final ReqHeaderPager requestHeaderPager) {
 
         final PagingResultBean<RequestHeader> 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);
         }

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<ScheduledJob> getScheduledJobList(final ScheduledJobPager scheduledJobPager) {
+    public List<ScheduledJob> getScheduledJobList(final SchedulerPager scheduledJobPager) {
 
         final PagingResultBean<ScheduledJob> 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);
         }

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<WebAuthentication> getWebAuthenticationList(final WebAuthenticationPager webAuthenticationPager) {
+    public List<WebAuthentication> getWebAuthenticationList(final WebAuthPager webAuthenticationPager) {
 
         final PagingResultBean<WebAuthentication> 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);
         }

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<Integer> 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"));
             });
         });
     }

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"));
             });
         });
     }

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;
 

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<Integer> 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"));
             });
         });
     }

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<Integer> 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"));
             });
         });
     }

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

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<Integer> 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"));
             });
         });
     }

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<String, Object> document =
                         indexingHelper.getDocument(

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
         }
 

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<String, String> entry : convertUrlMap.entrySet()) {
                     url = url.replaceAll(entry.getKey(), entry.getValue());
                 }
-                requestData.setUrl(replaceOverlappingHost(url));
+                requestData.setUrl(replaceDuplicateHost(url));
             }
         }
         return urlList;

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<String, String> initParamMap) {
         final Map<String, String> configParamMap = config.getHandlerParameterMap();
         final Map<String, String> 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);

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<String, String> 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();

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();
 

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<ENTITY extends Entity, CB extends Condi
     protected String scrollForCursor = "1m";
 
     protected abstract String asEsIndex();
-
     protected abstract String asEsIndexType();
-
     protected abstract String asEsSearchType();
-
     protected abstract <RESULT extends ENTITY> RESULT createEntity(Map<String, Object> source, Class<? extends RESULT> entityType);
 
     // ===================================================================================
@@ -178,9 +178,8 @@ public abstract class EsAbstractBehavior<ENTITY extends Entity, CB extends Condi
     }
 
     protected void delegateBulkRequest(final ConditionBean cb, Function<SearchHits, Boolean> 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<ENTITY extends Entity, CB extends Condi
 
     @Override
     protected int delegateQueryDelete(final ConditionBean cb, final DeleteOption<? extends ConditionBean> 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<ENTITY extends Entity, CB extends Condi
         updateOption.xtoBeCompatibleBatchUpdateDefaultEveryColumn();
         return updateOption;
     }
-
     protected boolean isCompatibleBatchInsertDefaultEveryColumn() {
         return true;
     }
@@ -526,3 +523,4 @@ public abstract class EsAbstractBehavior<ENTITY extends Entity, CB extends Condi
         }
     }
 }
+

src/main/java/org/codelibs/fess/es/config/allcommon/EsAbstractConditionBean.java

@@ -15,6 +15,7 @@
  */
 package org.codelibs.fess.es.config.allcommon;
 
+import org.codelibs.fess.es.config.allcommon.EsSqlClause;
 import org.dbflute.cbean.ConditionBean;
 import org.dbflute.cbean.chelper.HpCBPurpose;
 import org.dbflute.cbean.chelper.HpColumnSpHandler;
@@ -57,7 +58,6 @@ public abstract class EsAbstractConditionBean implements ConditionBean {
     //                                                                             Builder
     //                                                                             =======
     public abstract CountRequestBuilder build(CountRequestBuilder builder);
-
     public abstract SearchRequestBuilder build(SearchRequestBuilder builder);
 
     // ===================================================================================
@@ -698,3 +698,4 @@ public abstract class EsAbstractConditionBean implements ConditionBean {
         }
     }
 }
+

src/main/java/org/codelibs/fess/es/config/allcommon/EsAbstractConditionQuery.java

@@ -145,8 +145,7 @@ public abstract class EsAbstractConditionQuery implements ConditionQuery {
     //                                                                            Register
     //                                                                            ========
 
-    protected BoolQueryBuilder regBoolCQ(List<QueryBuilder> mustList, List<QueryBuilder> shouldList, List<QueryBuilder> mustNotList,
-            List<QueryBuilder> filterList) {
+    protected BoolQueryBuilder regBoolCQ(List<QueryBuilder> mustList, List<QueryBuilder> shouldList, List<QueryBuilder> mustNotList, List<QueryBuilder> 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);
     }
 }
+

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);
     }
 }
+

src/main/java/org/codelibs/fess/es/config/allcommon/EsPagingResultBean.java

@@ -62,3 +62,4 @@ public class EsPagingResultBean<ENTITY> extends PagingResultBean<ENTITY> {
         this.failedShards = failedShards;
     }
 }
+

src/main/java/org/codelibs/fess/es/config/bsbhv/BsBoostDocumentRuleBhv.java

@@ -172,7 +172,7 @@ public abstract class BsBoostDocumentRuleBhv extends EsAbstractBehavior<BoostDoc
     }
 
     public void selectBulk(CBCall<BoostDocumentRuleCB> cbLambda, EntityRowHandler<List<BoostDocumentRule>> entityLambda) {
-        delegateSelectBulk(createCB(cbLambda), entityLambda, typeOfSelectedEntity());
+        delegateSelectBulk(createCB(cbLambda), entityLambda,typeOfSelectedEntity());
     }
 
     // ===================================================================================
@@ -252,3 +252,4 @@ public abstract class BsBoostDocumentRuleBhv extends EsAbstractBehavior<BoostDoc
 
     // #pending create, modify, remove
 }
+

src/main/java/org/codelibs/fess/es/config/bsbhv/BsCrawlingInfoBhv.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.CrawlingSessionDbm;
-import org.codelibs.fess.es.config.cbean.CrawlingSessionCB;
-import org.codelibs.fess.es.config.exentity.CrawlingSession;
+import org.codelibs.fess.es.config.bsentity.dbmeta.CrawlingInfoDbm;
+import org.codelibs.fess.es.config.cbean.CrawlingInfoCB;
+import org.codelibs.fess.es.config.exentity.CrawlingInfo;
 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 BsCrawlingSessionBhv extends EsAbstractBehavior<CrawlingSession, CrawlingSessionCB> {
+public abstract class BsCrawlingInfoBhv extends EsAbstractBehavior<CrawlingInfo, CrawlingInfoCB> {
 
     // ===================================================================================
     //                                                                    Control Override
@@ -57,21 +57,21 @@ public abstract class BsCrawlingSessionBhv extends EsAbstractBehavior<CrawlingSe
 
     @Override
     public String asEsIndexType() {
-        return "crawling_session";
+        return "crawling_info";
     }
 
     @Override
     public String asEsSearchType() {
-        return "crawling_session";
+        return "crawling_info";
     }
 
     @Override
-    public CrawlingSessionDbm asDBMeta() {
-        return CrawlingSessionDbm.getInstance();
+    public CrawlingInfoDbm asDBMeta() {
+        return CrawlingInfoDbm.getInstance();
     }
 
     @Override
-    protected <RESULT extends CrawlingSession> RESULT createEntity(Map<String, Object> source, Class<? extends RESULT> entityType) {
+    protected <RESULT extends CrawlingInfo> RESULT createEntity(Map<String, Object> source, Class<? extends RESULT> entityType) {
         try {
             final RESULT result = entityType.newInstance();
             result.setCreatedTime(DfTypeUtil.toLong(source.get("createdTime")));
@@ -88,26 +88,26 @@ public abstract class BsCrawlingSessionBhv extends EsAbstractBehavior<CrawlingSe
     // ===================================================================================
     //                                                                              Select
     //                                                                              ======
-    public int selectCount(CBCall<CrawlingSessionCB> cbLambda) {
+    public int selectCount(CBCall<CrawlingInfoCB> cbLambda) {
         return facadeSelectCount(createCB(cbLambda));
     }
 
-    public OptionalEntity<CrawlingSession> selectEntity(CBCall<CrawlingSessionCB> cbLambda) {
+    public OptionalEntity<CrawlingInfo> selectEntity(CBCall<CrawlingInfoCB> cbLambda) {
         return facadeSelectEntity(createCB(cbLambda));
     }
 
-    protected OptionalEntity<CrawlingSession> facadeSelectEntity(CrawlingSessionCB cb) {
+    protected OptionalEntity<CrawlingInfo> facadeSelectEntity(CrawlingInfoCB cb) {
         return doSelectOptionalEntity(cb, typeOfSelectedEntity());
     }
 
-    protected <ENTITY extends CrawlingSession> OptionalEntity<ENTITY> doSelectOptionalEntity(CrawlingSessionCB cb,
+    protected <ENTITY extends CrawlingInfo> OptionalEntity<ENTITY> doSelectOptionalEntity(CrawlingInfoCB cb,
             Class<? extends ENTITY> 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<CrawlingSe
         return facadeSelectEntity(downcast(cb)).orElse(null);
     }
 
-    public CrawlingSession selectEntityWithDeletedCheck(CBCall<CrawlingSessionCB> cbLambda) {
+    public CrawlingInfo selectEntityWithDeletedCheck(CBCall<CrawlingInfoCB> cbLambda) {
         return facadeSelectEntityWithDeletedCheck(createCB(cbLambda));
     }
 
-    public OptionalEntity<CrawlingSession> selectByPK(String id) {
+    public OptionalEntity<CrawlingInfo> selectByPK(String id) {
         return facadeSelectByPK(id);
     }
 
-    protected OptionalEntity<CrawlingSession> facadeSelectByPK(String id) {
+    protected OptionalEntity<CrawlingInfo> facadeSelectByPK(String id) {
         return doSelectOptionalByPK(id, typeOfSelectedEntity());
     }
 
-    protected <ENTITY extends CrawlingSession> ENTITY doSelectByPK(String id, Class<? extends ENTITY> tp) {
+    protected <ENTITY extends CrawlingInfo> ENTITY doSelectByPK(String id, Class<? extends ENTITY> tp) {
         return doSelectEntity(xprepareCBAsPK(id), tp);
     }
 
-    protected CrawlingSessionCB xprepareCBAsPK(String id) {
+    protected CrawlingInfoCB xprepareCBAsPK(String id) {
         assertObjectNotNull("id", id);
         return newConditionBean().acceptPK(id);
     }
 
-    protected <ENTITY extends CrawlingSession> OptionalEntity<ENTITY> doSelectOptionalByPK(String id, Class<? extends ENTITY> tp) {
+    protected <ENTITY extends CrawlingInfo> OptionalEntity<ENTITY> doSelectOptionalByPK(String id, Class<? extends ENTITY> tp) {
         return createOptionalEntity(doSelectByPK(id, tp), id);
     }
 
     @Override
-    protected Class<? extends CrawlingSession> typeOfSelectedEntity() {
-        return CrawlingSession.class;
+    protected Class<? extends CrawlingInfo> typeOfSelectedEntity() {
+        return CrawlingInfo.class;
     }
 
     @Override
-    protected Class<CrawlingSession> typeOfHandlingEntity() {
-        return CrawlingSession.class;
+    protected Class<CrawlingInfo> typeOfHandlingEntity() {
+        return CrawlingInfo.class;
     }
 
     @Override
-    protected Class<CrawlingSessionCB> typeOfHandlingConditionBean() {
-        return CrawlingSessionCB.class;
+    protected Class<CrawlingInfoCB> typeOfHandlingConditionBean() {
+        return CrawlingInfoCB.class;
     }
 
-    public ListResultBean<CrawlingSession> selectList(CBCall<CrawlingSessionCB> cbLambda) {
+    public ListResultBean<CrawlingInfo> selectList(CBCall<CrawlingInfoCB> cbLambda) {
         return facadeSelectList(createCB(cbLambda));
     }
 
-    public PagingResultBean<CrawlingSession> selectPage(CBCall<CrawlingSessionCB> cbLambda) {
+    public PagingResultBean<CrawlingInfo> selectPage(CBCall<CrawlingInfoCB> cbLambda) {
         // #pending same?
-        return (PagingResultBean<CrawlingSession>) facadeSelectList(createCB(cbLambda));
+        return (PagingResultBean<CrawlingInfo>) facadeSelectList(createCB(cbLambda));
     }
 
-    public void selectCursor(CBCall<CrawlingSessionCB> cbLambda, EntityRowHandler<CrawlingSession> entityLambda) {
+    public void selectCursor(CBCall<CrawlingInfoCB> cbLambda, EntityRowHandler<CrawlingInfo> entityLambda) {
         facadeSelectCursor(createCB(cbLambda), entityLambda);
     }
 
-    public void selectBulk(CBCall<CrawlingSessionCB> cbLambda, EntityRowHandler<List<CrawlingSession>> entityLambda) {
-        delegateSelectBulk(createCB(cbLambda), entityLambda, typeOfSelectedEntity());
+    public void selectBulk(CBCall<CrawlingInfoCB> cbLambda, EntityRowHandler<List<CrawlingInfo>> 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<IndexRequestBuilder> opLambda) {
+    public void insert(CrawlingInfo entity, RequestOptionCall<IndexRequestBuilder> 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<IndexRequestBuilder> opLambda) {
+    public void update(CrawlingInfo entity, RequestOptionCall<IndexRequestBuilder> 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<IndexRequestBuilder> opLambda) {
+    public void insertOrUpdate(CrawlingInfo entity, RequestOptionCall<IndexRequestBuilder> 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<DeleteRequestBuilder> opLambda) {
+    public void delete(CrawlingInfo entity, RequestOptionCall<DeleteRequestBuilder> opLambda) {
         if (entity instanceof EsAbstractEntity) {
             entity.asDocMeta().deleteOption(opLambda);
         }
         doDelete(entity, null);
     }
 
-    public int queryDelete(CBCall<CrawlingSessionCB> cbLambda) {
+    public int queryDelete(CBCall<CrawlingInfoCB> cbLambda) {
         return doQueryDelete(createCB(cbLambda), null);
     }
 
-    public int[] batchInsert(List<CrawlingSession> list) {
+    public int[] batchInsert(List<CrawlingInfo> list) {
         return batchInsert(list, null);
     }
 
-    public int[] batchInsert(List<CrawlingSession> list, RequestOptionCall<BulkRequestBuilder> call) {
+    public int[] batchInsert(List<CrawlingInfo> list, RequestOptionCall<BulkRequestBuilder> call) {
         return doBatchInsert(new BulkList<>(list, call), null);
     }
 
-    public int[] batchUpdate(List<CrawlingSession> list) {
+    public int[] batchUpdate(List<CrawlingInfo> list) {
         return batchUpdate(list, null);
     }
 
-    public int[] batchUpdate(List<CrawlingSession> list, RequestOptionCall<BulkRequestBuilder> call) {
+    public int[] batchUpdate(List<CrawlingInfo> list, RequestOptionCall<BulkRequestBuilder> call) {
         return doBatchUpdate(new BulkList<>(list, call), null);
     }
 
-    public int[] batchDelete(List<CrawlingSession> list) {
+    public int[] batchDelete(List<CrawlingInfo> list) {
         return batchDelete(list, null);
     }
 
-    public int[] batchDelete(List<CrawlingSession> list, RequestOptionCall<BulkRequestBuilder> call) {
+    public int[] batchDelete(List<CrawlingInfo> list, RequestOptionCall<BulkRequestBuilder> call) {
         return doBatchDelete(new BulkList<>(list, call), null);
     }
 
     // #pending create, modify, remove
 }
+

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<CrawlingSessionInfo, CrawlingSessionInfoCB> {
+public abstract class BsCrawlingInfoParamBhv extends EsAbstractBehavior<CrawlingInfoParam, CrawlingInfoParamCB> {
 
     // ===================================================================================
     //                                                                    Control Override
@@ -57,24 +57,24 @@ public abstract class BsCrawlingSessionInfoBhv extends EsAbstractBehavior<Crawli
 
     @Override
     public String asEsIndexType() {
-        return "crawling_session_info";
+        return "crawling_info_param";
     }
 
     @Override
     public String asEsSearchType() {
-        return "crawling_session_info";
+        return "crawling_info_param";
     }
 
     @Override
-    public CrawlingSessionInfoDbm asDBMeta() {
-        return CrawlingSessionInfoDbm.getInstance();
+    public CrawlingInfoParamDbm asDBMeta() {
+        return CrawlingInfoParamDbm.getInstance();
     }
 
     @Override
-    protected <RESULT extends CrawlingSessionInfo> RESULT createEntity(Map<String, Object> source, Class<? extends RESULT> entityType) {
+    protected <RESULT extends CrawlingInfoParam> RESULT createEntity(Map<String, Object> source, Class<? extends RESULT> 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<Crawli
     // ===================================================================================
     //                                                                              Select
     //                                                                              ======
-    public int selectCount(CBCall<CrawlingSessionInfoCB> cbLambda) {
+    public int selectCount(CBCall<CrawlingInfoParamCB> cbLambda) {
         return facadeSelectCount(createCB(cbLambda));
     }
 
-    public OptionalEntity<CrawlingSessionInfo> selectEntity(CBCall<CrawlingSessionInfoCB> cbLambda) {
+    public OptionalEntity<CrawlingInfoParam> selectEntity(CBCall<CrawlingInfoParamCB> cbLambda) {
         return facadeSelectEntity(createCB(cbLambda));
     }
 
-    protected OptionalEntity<CrawlingSessionInfo> facadeSelectEntity(CrawlingSessionInfoCB cb) {
+    protected OptionalEntity<CrawlingInfoParam> facadeSelectEntity(CrawlingInfoParamCB cb) {
         return doSelectOptionalEntity(cb, typeOfSelectedEntity());
     }
 
-    protected <ENTITY extends CrawlingSessionInfo> OptionalEntity<ENTITY> doSelectOptionalEntity(CrawlingSessionInfoCB cb,
+    protected <ENTITY extends CrawlingInfoParam> OptionalEntity<ENTITY> doSelectOptionalEntity(CrawlingInfoParamCB cb,
             Class<? extends ENTITY> 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<Crawli
         return facadeSelectEntity(downcast(cb)).orElse(null);
     }
 
-    public CrawlingSessionInfo selectEntityWithDeletedCheck(CBCall<CrawlingSessionInfoCB> cbLambda) {
+    public CrawlingInfoParam selectEntityWithDeletedCheck(CBCall<CrawlingInfoParamCB> cbLambda) {
         return facadeSelectEntityWithDeletedCheck(createCB(cbLambda));
     }
 
-    public OptionalEntity<CrawlingSessionInfo> selectByPK(String id) {
+    public OptionalEntity<CrawlingInfoParam> selectByPK(String id) {
         return facadeSelectByPK(id);
     }
 
-    protected OptionalEntity<CrawlingSessionInfo> facadeSelectByPK(String id) {
+    protected OptionalEntity<CrawlingInfoParam> facadeSelectByPK(String id) {
         return doSelectOptionalByPK(id, typeOfSelectedEntity());
     }
 
-    protected <ENTITY extends CrawlingSessionInfo> ENTITY doSelectByPK(String id, Class<? extends ENTITY> tp) {
+    protected <ENTITY extends CrawlingInfoParam> ENTITY doSelectByPK(String id, Class<? extends ENTITY> tp) {
         return doSelectEntity(xprepareCBAsPK(id), tp);
     }
 
-    protected CrawlingSessionInfoCB xprepareCBAsPK(String id) {
+    protected CrawlingInfoParamCB xprepareCBAsPK(String id) {
         assertObjectNotNull("id", id);
         return newConditionBean().acceptPK(id);
     }
 
-    protected <ENTITY extends CrawlingSessionInfo> OptionalEntity<ENTITY> doSelectOptionalByPK(String id, Class<? extends ENTITY> tp) {
+    protected <ENTITY extends CrawlingInfoParam> OptionalEntity<ENTITY> doSelectOptionalByPK(String id, Class<? extends ENTITY> tp) {
         return createOptionalEntity(doSelectByPK(id, tp), id);
     }
 
     @Override
-    protected Class<? extends CrawlingSessionInfo> typeOfSelectedEntity() {
-        return CrawlingSessionInfo.class;
+    protected Class<? extends CrawlingInfoParam> typeOfSelectedEntity() {
+        return CrawlingInfoParam.class;
     }
 
     @Override
-    protected Class<CrawlingSessionInfo> typeOfHandlingEntity() {
-        return CrawlingSessionInfo.class;
+    protected Class<CrawlingInfoParam> typeOfHandlingEntity() {
+        return CrawlingInfoParam.class;
     }
 
     @Override
-    protected Class<CrawlingSessionInfoCB> typeOfHandlingConditionBean() {
-        return CrawlingSessionInfoCB.class;
+    protected Class<CrawlingInfoParamCB> typeOfHandlingConditionBean() {
+        return CrawlingInfoParamCB.class;
     }
 
-    public ListResultBean<CrawlingSessionInfo> selectList(CBCall<CrawlingSessionInfoCB> cbLambda) {
+    public ListResultBean<CrawlingInfoParam> selectList(CBCall<CrawlingInfoParamCB> cbLambda) {
         return facadeSelectList(createCB(cbLambda));
     }
 
-    public PagingResultBean<CrawlingSessionInfo> selectPage(CBCall<CrawlingSessionInfoCB> cbLambda) {
+    public PagingResultBean<CrawlingInfoParam> selectPage(CBCall<CrawlingInfoParamCB> cbLambda) {
         // #pending same?
-        return (PagingResultBean<CrawlingSessionInfo>) facadeSelectList(createCB(cbLambda));
+        return (PagingResultBean<CrawlingInfoParam>) facadeSelectList(createCB(cbLambda));
     }
 
-    public void selectCursor(CBCall<CrawlingSessionInfoCB> cbLambda, EntityRowHandler<CrawlingSessionInfo> entityLambda) {
+    public void selectCursor(CBCall<CrawlingInfoParamCB> cbLambda, EntityRowHandler<CrawlingInfoParam> entityLambda) {
         facadeSelectCursor(createCB(cbLambda), entityLambda);
     }
 
-    public void selectBulk(CBCall<CrawlingSessionInfoCB> cbLambda, EntityRowHandler<List<CrawlingSessionInfo>> entityLambda) {
-        delegateSelectBulk(createCB(cbLambda), entityLambda, typeOfSelectedEntity());
+    public void selectBulk(CBCall<CrawlingInfoParamCB> cbLambda, EntityRowHandler<List<CrawlingInfoParam>> 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<IndexRequestBuilder> opLambda) {
+    public void insert(CrawlingInfoParam entity, RequestOptionCall<IndexRequestBuilder> 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<IndexRequestBuilder> opLambda) {
+    public void update(CrawlingInfoParam entity, RequestOptionCall<IndexRequestBuilder> 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<IndexRequestBuilder> opLambda) {
+    public void insertOrUpdate(CrawlingInfoParam entity, RequestOptionCall<IndexRequestBuilder> 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<DeleteRequestBuilder> opLambda) {
+    public void delete(CrawlingInfoParam entity, RequestOptionCall<DeleteRequestBuilder> opLambda) {
         if (entity instanceof EsAbstractEntity) {
             entity.asDocMeta().deleteOption(opLambda);
         }
         doDelete(entity, null);
     }
 
-    public int queryDelete(CBCall<CrawlingSessionInfoCB> cbLambda) {
+    public int queryDelete(CBCall<CrawlingInfoParamCB> cbLambda) {
         return doQueryDelete(createCB(cbLambda), null);
     }
 
-    public int[] batchInsert(List<CrawlingSessionInfo> list) {
+    public int[] batchInsert(List<CrawlingInfoParam> list) {
         return batchInsert(list, null);
     }
 
-    public int[] batchInsert(List<CrawlingSessionInfo> list, RequestOptionCall<BulkRequestBuilder> call) {
+    public int[] batchInsert(List<CrawlingInfoParam> list, RequestOptionCall<BulkRequestBuilder> call) {
         return doBatchInsert(new BulkList<>(list, call), null);
     }
 
-    public int[] batchUpdate(List<CrawlingSessionInfo> list) {
+    public int[] batchUpdate(List<CrawlingInfoParam> list) {
         return batchUpdate(list, null);
     }
 
-    public int[] batchUpdate(List<CrawlingSessionInfo> list, RequestOptionCall<BulkRequestBuilder> call) {
+    public int[] batchUpdate(List<CrawlingInfoParam> list, RequestOptionCall<BulkRequestBuilder> call) {
         return doBatchUpdate(new BulkList<>(list, call), null);
     }
 
-    public int[] batchDelete(List<CrawlingSessionInfo> list) {
+    public int[] batchDelete(List<CrawlingInfoParam> list) {
         return batchDelete(list, null);
     }
 
-    public int[] batchDelete(List<CrawlingSessionInfo> list, RequestOptionCall<BulkRequestBuilder> call) {
+    public int[] batchDelete(List<CrawlingInfoParam> list, RequestOptionCall<BulkRequestBuilder> call) {
         return doBatchDelete(new BulkList<>(list, call), null);
     }
 
     // #pending create, modify, remove
 }
+

src/main/java/org/codelibs/fess/es/config/bsbhv/BsDataConfigBhv.java

@@ -107,7 +107,8 @@ public abstract class BsDataConfigBhv extends EsAbstractBehavior<DataConfig, Dat
         return doSelectOptionalEntity(cb, typeOfSelectedEntity());
     }
 
-    protected <ENTITY extends DataConfig> OptionalEntity<ENTITY> doSelectOptionalEntity(DataConfigCB cb, Class<? extends ENTITY> tp) {
+    protected <ENTITY extends DataConfig> OptionalEntity<ENTITY> doSelectOptionalEntity(DataConfigCB cb,
+            Class<? extends ENTITY> tp) {
         return createOptionalEntity(doSelectEntity(cb, tp), cb);
     }
 
@@ -175,7 +176,7 @@ public abstract class BsDataConfigBhv extends EsAbstractBehavior<DataConfig, Dat
     }
 
     public void selectBulk(CBCall<DataConfigCB> cbLambda, EntityRowHandler<List<DataConfig>> entityLambda) {
-        delegateSelectBulk(createCB(cbLambda), entityLambda, typeOfSelectedEntity());
+        delegateSelectBulk(createCB(cbLambda), entityLambda,typeOfSelectedEntity());
     }
 
     // ===================================================================================
@@ -255,3 +256,4 @@ public abstract class BsDataConfigBhv extends EsAbstractBehavior<DataConfig, Dat
 
     // #pending create, modify, remove
 }
+

src/main/java/org/codelibs/fess/es/config/bsbhv/BsDataConfigToLabelBhv.java

@@ -167,7 +167,7 @@ public abstract class BsDataConfigToLabelBhv extends EsAbstractBehavior<DataConf
     }
 
     public void selectBulk(CBCall<DataConfigToLabelCB> cbLambda, EntityRowHandler<List<DataConfigToLabel>> entityLambda) {
-        delegateSelectBulk(createCB(cbLambda), entityLambda, typeOfSelectedEntity());
+        delegateSelectBulk(createCB(cbLambda), entityLambda,typeOfSelectedEntity());
     }
 
     // ===================================================================================
@@ -247,3 +247,4 @@ public abstract class BsDataConfigToLabelBhv extends EsAbstractBehavior<DataConf
 
     // #pending create, modify, remove
 }
+

src/main/java/org/codelibs/fess/es/config/bsbhv/BsDataConfigToRoleBhv.java

@@ -167,7 +167,7 @@ public abstract class BsDataConfigToRoleBhv extends EsAbstractBehavior<DataConfi
     }
 
     public void selectBulk(CBCall<DataConfigToRoleCB> cbLambda, EntityRowHandler<List<DataConfigToRole>> entityLambda) {
-        delegateSelectBulk(createCB(cbLambda), entityLambda, typeOfSelectedEntity());
+        delegateSelectBulk(createCB(cbLambda), entityLambda,typeOfSelectedEntity());
     }
 
     // ===================================================================================
@@ -247,3 +247,4 @@ public abstract class BsDataConfigToRoleBhv extends EsAbstractBehavior<DataConfi
 
     // #pending create, modify, remove
 }
+

src/main/java/org/codelibs/fess/es/config/bsbhv/BsDuplicateHostBhv.java

@@ -103,7 +103,8 @@ public abstract class BsDuplicateHostBhv extends EsAbstractBehavior<DuplicateHos
         return doSelectOptionalEntity(cb, typeOfSelectedEntity());
     }
 
-    protected <ENTITY extends DuplicateHost> OptionalEntity<ENTITY> doSelectOptionalEntity(DuplicateHostCB cb, Class<? extends ENTITY> tp) {
+    protected <ENTITY extends DuplicateHost> OptionalEntity<ENTITY> doSelectOptionalEntity(DuplicateHostCB cb,
+            Class<? extends ENTITY> tp) {
         return createOptionalEntity(doSelectEntity(cb, tp), cb);
     }
 
@@ -171,7 +172,7 @@ public abstract class BsDuplicateHostBhv extends EsAbstractBehavior<DuplicateHos
     }
 
     public void selectBulk(CBCall<DuplicateHostCB> cbLambda, EntityRowHandler<List<DuplicateHost>> entityLambda) {
-        delegateSelectBulk(createCB(cbLambda), entityLambda, typeOfSelectedEntity());
+        delegateSelectBulk(createCB(cbLambda), entityLambda,typeOfSelectedEntity());
     }
 
     // ===================================================================================
@@ -251,3 +252,4 @@ public abstract class BsDuplicateHostBhv extends EsAbstractBehavior<DuplicateHos
 
     // #pending create, modify, remove
 }
+

src/main/java/org/codelibs/fess/es/config/bsbhv/BsFailureUrlBhv.java

@@ -103,7 +103,8 @@ public abstract class BsFailureUrlBhv extends EsAbstractBehavior<FailureUrl, Fai
         return doSelectOptionalEntity(cb, typeOfSelectedEntity());
     }
 
-    protected <ENTITY extends FailureUrl> OptionalEntity<ENTITY> doSelectOptionalEntity(FailureUrlCB cb, Class<? extends ENTITY> tp) {
+    protected <ENTITY extends FailureUrl> OptionalEntity<ENTITY> doSelectOptionalEntity(FailureUrlCB cb,
+            Class<? extends ENTITY> tp) {
         return createOptionalEntity(doSelectEntity(cb, tp), cb);
     }
 
@@ -171,7 +172,7 @@ public abstract class BsFailureUrlBhv extends EsAbstractBehavior<FailureUrl, Fai
     }
 
     public void selectBulk(CBCall<FailureUrlCB> cbLambda, EntityRowHandler<List<FailureUrl>> entityLambda) {
-        delegateSelectBulk(createCB(cbLambda), entityLambda, typeOfSelectedEntity());
+        delegateSelectBulk(createCB(cbLambda), entityLambda,typeOfSelectedEntity());
     }
 
     // ===================================================================================
@@ -251,3 +252,4 @@ public abstract class BsFailureUrlBhv extends EsAbstractBehavior<FailureUrl, Fai
 
     // #pending create, modify, remove
 }
+

src/main/java/org/codelibs/fess/es/config/bsbhv/BsFileAuthenticationBhv.java

@@ -176,7 +176,7 @@ public abstract class BsFileAuthenticationBhv extends EsAbstractBehavior<FileAut
     }
 
     public void selectBulk(CBCall<FileAuthenticationCB> cbLambda, EntityRowHandler<List<FileAuthentication>> entityLambda) {
-        delegateSelectBulk(createCB(cbLambda), entityLambda, typeOfSelectedEntity());
+        delegateSelectBulk(createCB(cbLambda), entityLambda,typeOfSelectedEntity());
     }
 
     // ===================================================================================
@@ -256,3 +256,4 @@ public abstract class BsFileAuthenticationBhv extends EsAbstractBehavior<FileAut
 
     // #pending create, modify, remove
 }
+

src/main/java/org/codelibs/fess/es/config/bsbhv/BsFileConfigBhv.java

@@ -115,7 +115,8 @@ public abstract class BsFileConfigBhv extends EsAbstractBehavior<FileConfig, Fil
         return doSelectOptionalEntity(cb, typeOfSelectedEntity());
     }
 
-    protected <ENTITY extends FileConfig> OptionalEntity<ENTITY> doSelectOptionalEntity(FileConfigCB cb, Class<? extends ENTITY> tp) {
+    protected <ENTITY extends FileConfig> OptionalEntity<ENTITY> doSelectOptionalEntity(FileConfigCB cb,
+            Class<? extends ENTITY> tp) {
         return createOptionalEntity(doSelectEntity(cb, tp), cb);
     }
 
@@ -183,7 +184,7 @@ public abstract class BsFileConfigBhv extends EsAbstractBehavior<FileConfig, Fil
     }
 
     public void selectBulk(CBCall<FileConfigCB> cbLambda, EntityRowHandler<List<FileConfig>> entityLambda) {
-        delegateSelectBulk(createCB(cbLambda), entityLambda, typeOfSelectedEntity());
+        delegateSelectBulk(createCB(cbLambda), entityLambda,typeOfSelectedEntity());
     }
 
     // ===================================================================================
@@ -263,3 +264,4 @@ public abstract class BsFileConfigBhv extends EsAbstractBehavior<FileConfig, Fil
 
     // #pending create, modify, remove
 }
+

src/main/java/org/codelibs/fess/es/config/bsbhv/BsFileConfigToLabelBhv.java

@@ -167,7 +167,7 @@ public abstract class BsFileConfigToLabelBhv extends EsAbstractBehavior<FileConf
     }
 
     public void selectBulk(CBCall<FileConfigToLabelCB> cbLambda, EntityRowHandler<List<FileConfigToLabel>> entityLambda) {
-        delegateSelectBulk(createCB(cbLambda), entityLambda, typeOfSelectedEntity());
+        delegateSelectBulk(createCB(cbLambda), entityLambda,typeOfSelectedEntity());
     }
 
     // ===================================================================================
@@ -247,3 +247,4 @@ public abstract class BsFileConfigToLabelBhv extends EsAbstractBehavior<FileConf
 
     // #pending create, modify, remove
 }
+

src/main/java/org/codelibs/fess/es/config/bsbhv/BsFileConfigToRoleBhv.java

@@ -167,7 +167,7 @@ public abstract class BsFileConfigToRoleBhv extends EsAbstractBehavior<FileConfi
     }
 
     public void selectBulk(CBCall<FileConfigToRoleCB> cbLambda, EntityRowHandler<List<FileConfigToRole>> entityLambda) {
-        delegateSelectBulk(createCB(cbLambda), entityLambda, typeOfSelectedEntity());
+        delegateSelectBulk(createCB(cbLambda), entityLambda,typeOfSelectedEntity());
     }
 
     // ===================================================================================
@@ -247,3 +247,4 @@ public abstract class BsFileConfigToRoleBhv extends EsAbstractBehavior<FileConfi
 
     // #pending create, modify, remove
 }
+

src/main/java/org/codelibs/fess/es/config/bsbhv/BsJobLogBhv.java

@@ -104,7 +104,8 @@ public abstract class BsJobLogBhv extends EsAbstractBehavior<JobLog, JobLogCB> {
         return doSelectOptionalEntity(cb, typeOfSelectedEntity());
     }
 
-    protected <ENTITY extends JobLog> OptionalEntity<ENTITY> doSelectOptionalEntity(JobLogCB cb, Class<? extends ENTITY> tp) {
+    protected <ENTITY extends JobLog> OptionalEntity<ENTITY> doSelectOptionalEntity(JobLogCB cb,
+            Class<? extends ENTITY> tp) {
         return createOptionalEntity(doSelectEntity(cb, tp), cb);
     }
 
@@ -172,7 +173,7 @@ public abstract class BsJobLogBhv extends EsAbstractBehavior<JobLog, JobLogCB> {
     }
 
     public void selectBulk(CBCall<JobLogCB> cbLambda, EntityRowHandler<List<JobLog>> entityLambda) {
-        delegateSelectBulk(createCB(cbLambda), entityLambda, typeOfSelectedEntity());
+        delegateSelectBulk(createCB(cbLambda), entityLambda,typeOfSelectedEntity());
     }
 
     // ===================================================================================
@@ -252,3 +253,4 @@ public abstract class BsJobLogBhv extends EsAbstractBehavior<JobLog, JobLogCB> {
 
     // #pending create, modify, remove
 }
+

src/main/java/org/codelibs/fess/es/config/bsbhv/BsKeyMatchBhv.java

@@ -104,7 +104,8 @@ public abstract class BsKeyMatchBhv extends EsAbstractBehavior<KeyMatch, KeyMatc
         return doSelectOptionalEntity(cb, typeOfSelectedEntity());
     }
 
-    protected <ENTITY extends KeyMatch> OptionalEntity<ENTITY> doSelectOptionalEntity(KeyMatchCB cb, Class<? extends ENTITY> tp) {
+    protected <ENTITY extends KeyMatch> OptionalEntity<ENTITY> doSelectOptionalEntity(KeyMatchCB cb,
+            Class<? extends ENTITY> tp) {
         return createOptionalEntity(doSelectEntity(cb, tp), cb);
     }
 
@@ -172,7 +173,7 @@ public abstract class BsKeyMatchBhv extends EsAbstractBehavior<KeyMatch, KeyMatc
     }
 
     public void selectBulk(CBCall<KeyMatchCB> cbLambda, EntityRowHandler<List<KeyMatch>> entityLambda) {
-        delegateSelectBulk(createCB(cbLambda), entityLambda, typeOfSelectedEntity());
+        delegateSelectBulk(createCB(cbLambda), entityLambda,typeOfSelectedEntity());
     }
 
     // ===================================================================================
@@ -252,3 +253,4 @@ public abstract class BsKeyMatchBhv extends EsAbstractBehavior<KeyMatch, KeyMatc
 
     // #pending create, modify, remove
 }
+

src/main/java/org/codelibs/fess/es/config/bsbhv/BsLabelToRoleBhv.java

@@ -98,7 +98,8 @@ public abstract class BsLabelToRoleBhv extends EsAbstractBehavior<LabelToRole, L
         return doSelectOptionalEntity(cb, typeOfSelectedEntity());
     }
 
-    protected <ENTITY extends LabelToRole> OptionalEntity<ENTITY> doSelectOptionalEntity(LabelToRoleCB cb, Class<? extends ENTITY> tp) {
+    protected <ENTITY extends LabelToRole> OptionalEntity<ENTITY> doSelectOptionalEntity(LabelToRoleCB cb,
+            Class<? extends ENTITY> tp) {
         return createOptionalEntity(doSelectEntity(cb, tp), cb);
     }
 
@@ -166,7 +167,7 @@ public abstract class BsLabelToRoleBhv extends EsAbstractBehavior<LabelToRole, L
     }
 
     public void selectBulk(CBCall<LabelToRoleCB> cbLambda, EntityRowHandler<List<LabelToRole>> entityLambda) {
-        delegateSelectBulk(createCB(cbLambda), entityLambda, typeOfSelectedEntity());
+        delegateSelectBulk(createCB(cbLambda), entityLambda,typeOfSelectedEntity());
     }
 
     // ===================================================================================
@@ -246,3 +247,4 @@ public abstract class BsLabelToRoleBhv extends EsAbstractBehavior<LabelToRole, L
 
     // #pending create, modify, remove
 }
+

src/main/java/org/codelibs/fess/es/config/bsbhv/BsLabelTypeBhv.java

@@ -105,7 +105,8 @@ public abstract class BsLabelTypeBhv extends EsAbstractBehavior<LabelType, Label
         return doSelectOptionalEntity(cb, typeOfSelectedEntity());
     }
 
-    protected <ENTITY extends LabelType> OptionalEntity<ENTITY> doSelectOptionalEntity(LabelTypeCB cb, Class<? extends ENTITY> tp) {
+    protected <ENTITY extends LabelType> OptionalEntity<ENTITY> doSelectOptionalEntity(LabelTypeCB cb,
+            Class<? extends ENTITY> tp) {
         return createOptionalEntity(doSelectEntity(cb, tp), cb);
     }
 
@@ -173,7 +174,7 @@ public abstract class BsLabelTypeBhv extends EsAbstractBehavior<LabelType, Label
     }
 
     public void selectBulk(CBCall<LabelTypeCB> cbLambda, EntityRowHandler<List<LabelType>> entityLambda) {
-        delegateSelectBulk(createCB(cbLambda), entityLambda, typeOfSelectedEntity());
+        delegateSelectBulk(createCB(cbLambda), entityLambda,typeOfSelectedEntity());
     }
 
     // ===================================================================================
@@ -253,3 +254,4 @@ public abstract class BsLabelTypeBhv extends EsAbstractBehavior<LabelType, Label
 
     // #pending create, modify, remove
 }
+

src/main/java/org/codelibs/fess/es/config/bsbhv/BsPathMappingBhv.java

@@ -104,7 +104,8 @@ public abstract class BsPathMappingBhv extends EsAbstractBehavior<PathMapping, P
         return doSelectOptionalEntity(cb, typeOfSelectedEntity());
     }
 
-    protected <ENTITY extends PathMapping> OptionalEntity<ENTITY> doSelectOptionalEntity(PathMappingCB cb, Class<? extends ENTITY> tp) {
+    protected <ENTITY extends PathMapping> OptionalEntity<ENTITY> doSelectOptionalEntity(PathMappingCB cb,
+            Class<? extends ENTITY> tp) {
         return createOptionalEntity(doSelectEntity(cb, tp), cb);
     }
 
@@ -172,7 +173,7 @@ public abstract class BsPathMappingBhv extends EsAbstractBehavior<PathMapping, P
     }
 
     public void selectBulk(CBCall<PathMappingCB> cbLambda, EntityRowHandler<List<PathMapping>> entityLambda) {
-        delegateSelectBulk(createCB(cbLambda), entityLambda, typeOfSelectedEntity());
+        delegateSelectBulk(createCB(cbLambda), entityLambda,typeOfSelectedEntity());
     }
 
     // ===================================================================================
@@ -252,3 +253,4 @@ public abstract class BsPathMappingBhv extends EsAbstractBehavior<PathMapping, P
 
     // #pending create, modify, remove
 }
+

src/main/java/org/codelibs/fess/es/config/bsbhv/BsRequestHeaderBhv.java

@@ -103,7 +103,8 @@ public abstract class BsRequestHeaderBhv extends EsAbstractBehavior<RequestHeade
         return doSelectOptionalEntity(cb, typeOfSelectedEntity());
     }
 
-    protected <ENTITY extends RequestHeader> OptionalEntity<ENTITY> doSelectOptionalEntity(RequestHeaderCB cb, Class<? extends ENTITY> tp) {
+    protected <ENTITY extends RequestHeader> OptionalEntity<ENTITY> doSelectOptionalEntity(RequestHeaderCB cb,
+            Class<? extends ENTITY> tp) {
         return createOptionalEntity(doSelectEntity(cb, tp), cb);
     }
 
@@ -171,7 +172,7 @@ public abstract class BsRequestHeaderBhv extends EsAbstractBehavior<RequestHeade
     }
 
     public void selectBulk(CBCall<RequestHeaderCB> cbLambda, EntityRowHandler<List<RequestHeader>> entityLambda) {
-        delegateSelectBulk(createCB(cbLambda), entityLambda, typeOfSelectedEntity());
+        delegateSelectBulk(createCB(cbLambda), entityLambda,typeOfSelectedEntity());
     }
 
     // ===================================================================================
@@ -251,3 +252,4 @@ public abstract class BsRequestHeaderBhv extends EsAbstractBehavior<RequestHeade
 
     // #pending create, modify, remove
 }
+

src/main/java/org/codelibs/fess/es/config/bsbhv/BsRoleTypeBhv.java

@@ -103,7 +103,8 @@ public abstract class BsRoleTypeBhv extends EsAbstractBehavior<RoleType, RoleTyp
         return doSelectOptionalEntity(cb, typeOfSelectedEntity());
     }
 
-    protected <ENTITY extends RoleType> OptionalEntity<ENTITY> doSelectOptionalEntity(RoleTypeCB cb, Class<? extends ENTITY> tp) {
+    protected <ENTITY extends RoleType> OptionalEntity<ENTITY> doSelectOptionalEntity(RoleTypeCB cb,
+            Class<? extends ENTITY> tp) {
         return createOptionalEntity(doSelectEntity(cb, tp), cb);
     }
 
@@ -171,7 +172,7 @@ public abstract class BsRoleTypeBhv extends EsAbstractBehavior<RoleType, RoleTyp
     }
 
     public void selectBulk(CBCall<RoleTypeCB> cbLambda, EntityRowHandler<List<RoleType>> entityLambda) {
-        delegateSelectBulk(createCB(cbLambda), entityLambda, typeOfSelectedEntity());
+        delegateSelectBulk(createCB(cbLambda), entityLambda,typeOfSelectedEntity());
     }
 
     // ===================================================================================
@@ -251,3 +252,4 @@ public abstract class BsRoleTypeBhv extends EsAbstractBehavior<RoleType, RoleTyp
 
     // #pending create, modify, remove
 }
+

src/main/java/org/codelibs/fess/es/config/bsbhv/BsScheduledJobBhv.java

@@ -109,7 +109,8 @@ public abstract class BsScheduledJobBhv extends EsAbstractBehavior<ScheduledJob,
         return doSelectOptionalEntity(cb, typeOfSelectedEntity());
     }
 
-    protected <ENTITY extends ScheduledJob> OptionalEntity<ENTITY> doSelectOptionalEntity(ScheduledJobCB cb, Class<? extends ENTITY> tp) {
+    protected <ENTITY extends ScheduledJob> OptionalEntity<ENTITY> doSelectOptionalEntity(ScheduledJobCB cb,
+            Class<? extends ENTITY> tp) {
         return createOptionalEntity(doSelectEntity(cb, tp), cb);
     }
 
@@ -177,7 +178,7 @@ public abstract class BsScheduledJobBhv extends EsAbstractBehavior<ScheduledJob,
     }
 
     public void selectBulk(CBCall<ScheduledJobCB> cbLambda, EntityRowHandler<List<ScheduledJob>> entityLambda) {
-        delegateSelectBulk(createCB(cbLambda), entityLambda, typeOfSelectedEntity());
+        delegateSelectBulk(createCB(cbLambda), entityLambda,typeOfSelectedEntity());
     }
 
     // ===================================================================================
@@ -257,3 +258,4 @@ public abstract class BsScheduledJobBhv extends EsAbstractBehavior<ScheduledJob,
 
     // #pending create, modify, remove
 }
+

src/main/java/org/codelibs/fess/es/config/bsbhv/BsSuggestBadWordBhv.java

@@ -103,7 +103,8 @@ public abstract class BsSuggestBadWordBhv extends EsAbstractBehavior<SuggestBadW
         return doSelectOptionalEntity(cb, typeOfSelectedEntity());
     }
 
-    protected <ENTITY extends SuggestBadWord> OptionalEntity<ENTITY> doSelectOptionalEntity(SuggestBadWordCB cb, Class<? extends ENTITY> tp) {
+    protected <ENTITY extends SuggestBadWord> OptionalEntity<ENTITY> doSelectOptionalEntity(SuggestBadWordCB cb,
+            Class<? extends ENTITY> tp) {
         return createOptionalEntity(doSelectEntity(cb, tp), cb);
     }
 
@@ -171,7 +172,7 @@ public abstract class BsSuggestBadWordBhv extends EsAbstractBehavior<SuggestBadW
     }
 
     public void selectBulk(CBCall<SuggestBadWordCB> cbLambda, EntityRowHandler<List<SuggestBadWord>> entityLambda) {
-        delegateSelectBulk(createCB(cbLambda), entityLambda, typeOfSelectedEntity());
+        delegateSelectBulk(createCB(cbLambda), entityLambda,typeOfSelectedEntity());
     }
 
     // ===================================================================================
@@ -251,3 +252,4 @@ public abstract class BsSuggestBadWordBhv extends EsAbstractBehavior<SuggestBadW
 
     // #pending create, modify, remove
 }
+

src/main/java/org/codelibs/fess/es/config/bsbhv/BsSuggestElevateWordBhv.java

@@ -174,7 +174,7 @@ public abstract class BsSuggestElevateWordBhv extends EsAbstractBehavior<Suggest
     }
 
     public void selectBulk(CBCall<SuggestElevateWordCB> cbLambda, EntityRowHandler<List<SuggestElevateWord>> entityLambda) {
-        delegateSelectBulk(createCB(cbLambda), entityLambda, typeOfSelectedEntity());
+        delegateSelectBulk(createCB(cbLambda), entityLambda,typeOfSelectedEntity());
     }
 
     // ===================================================================================
@@ -254,3 +254,4 @@ public abstract class BsSuggestElevateWordBhv extends EsAbstractBehavior<Suggest
 
     // #pending create, modify, remove
 }
+

src/main/java/org/codelibs/fess/es/config/bsbhv/BsSuggestElevateWordToLabelBhv.java

@@ -167,7 +167,7 @@ public abstract class BsSuggestElevateWordToLabelBhv extends EsAbstractBehavior<
     }
 
     public void selectBulk(CBCall<SuggestElevateWordToLabelCB> cbLambda, EntityRowHandler<List<SuggestElevateWordToLabel>> 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
 }
+

src/main/java/org/codelibs/fess/es/config/bsbhv/BsWebAuthenticationBhv.java

@@ -177,7 +177,7 @@ public abstract class BsWebAuthenticationBhv extends EsAbstractBehavior<WebAuthe
     }
 
     public void selectBulk(CBCall<WebAuthenticationCB> cbLambda, EntityRowHandler<List<WebAuthentication>> entityLambda) {
-        delegateSelectBulk(createCB(cbLambda), entityLambda, typeOfSelectedEntity());
+        delegateSelectBulk(createCB(cbLambda), entityLambda,typeOfSelectedEntity());
     }
 
     // ===================================================================================
@@ -257,3 +257,4 @@ public abstract class BsWebAuthenticationBhv extends EsAbstractBehavior<WebAuthe
 
     // #pending create, modify, remove
 }
+

src/main/java/org/codelibs/fess/es/config/bsbhv/BsWebConfigBhv.java

@@ -116,7 +116,8 @@ public abstract class BsWebConfigBhv extends EsAbstractBehavior<WebConfig, WebCo
         return doSelectOptionalEntity(cb, typeOfSelectedEntity());
     }
 
-    protected <ENTITY extends WebConfig> OptionalEntity<ENTITY> doSelectOptionalEntity(WebConfigCB cb, Class<? extends ENTITY> tp) {
+    protected <ENTITY extends WebConfig> OptionalEntity<ENTITY> doSelectOptionalEntity(WebConfigCB cb,
+            Class<? extends ENTITY> tp) {
         return createOptionalEntity(doSelectEntity(cb, tp), cb);
     }
 
@@ -184,7 +185,7 @@ public abstract class BsWebConfigBhv extends EsAbstractBehavior<WebConfig, WebCo
     }
 
     public void selectBulk(CBCall<WebConfigCB> cbLambda, EntityRowHandler<List<WebConfig>> entityLambda) {
-        delegateSelectBulk(createCB(cbLambda), entityLambda, typeOfSelectedEntity());
+        delegateSelectBulk(createCB(cbLambda), entityLambda,typeOfSelectedEntity());
     }
 
     // ===================================================================================
@@ -264,3 +265,4 @@ public abstract class BsWebConfigBhv extends EsAbstractBehavior<WebConfig, WebCo
 
     // #pending create, modify, remove
 }
+

src/main/java/org/codelibs/fess/es/config/bsbhv/BsWebConfigToLabelBhv.java

@@ -167,7 +167,7 @@ public abstract class BsWebConfigToLabelBhv extends EsAbstractBehavior<WebConfig
     }
 
     public void selectBulk(CBCall<WebConfigToLabelCB> cbLambda, EntityRowHandler<List<WebConfigToLabel>> entityLambda) {
-        delegateSelectBulk(createCB(cbLambda), entityLambda, typeOfSelectedEntity());
+        delegateSelectBulk(createCB(cbLambda), entityLambda,typeOfSelectedEntity());
     }
 
     // ===================================================================================
@@ -247,3 +247,4 @@ public abstract class BsWebConfigToLabelBhv extends EsAbstractBehavior<WebConfig
 
     // #pending create, modify, remove
 }
+

src/main/java/org/codelibs/fess/es/config/bsbhv/BsWebConfigToRoleBhv.java

@@ -167,7 +167,7 @@ public abstract class BsWebConfigToRoleBhv extends EsAbstractBehavior<WebConfigT
     }
 
     public void selectBulk(CBCall<WebConfigToRoleCB> cbLambda, EntityRowHandler<List<WebConfigToRole>> entityLambda) {
-        delegateSelectBulk(createCB(cbLambda), entityLambda, typeOfSelectedEntity());
+        delegateSelectBulk(createCB(cbLambda), entityLambda,typeOfSelectedEntity());
     }
 
     // ===================================================================================
@@ -247,3 +247,4 @@ public abstract class BsWebConfigToRoleBhv extends EsAbstractBehavior<WebConfigT
 
     // #pending create, modify, remove
 }
+

src/main/java/org/codelibs/fess/es/config/bsentity/BsBoostDocumentRule.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;
 

src/main/java/org/codelibs/fess/es/config/bsentity/BsCrawlingInfo.java

@@ -15,18 +15,18 @@
  */
 package org.codelibs.fess.es.config.bsentity;
 
-import java.time.LocalDateTime;
+import java.time.*;
 import java.util.HashMap;
 import java.util.Map;
 
 import org.codelibs.fess.es.config.allcommon.EsAbstractEntity;
-import org.codelibs.fess.es.config.bsentity.dbmeta.CrawlingSessionDbm;
+import org.codelibs.fess.es.config.bsentity.dbmeta.CrawlingInfoDbm;
 
 /**
  * ${table.comment}
  * @author ESFlute (using FreeGen)
  */
-public class BsCrawlingSession extends EsAbstractEntity {
+public class BsCrawlingInfo extends EsAbstractEntity {
 
     // ===================================================================================
     //                                                                          Definition
@@ -55,13 +55,13 @@ public class BsCrawlingSession extends EsAbstractEntity {
     //                                                                             DB Meta
     //                                                                             =======
     @Override
-    public CrawlingSessionDbm asDBMeta() {
-        return CrawlingSessionDbm.getInstance();
+    public CrawlingInfoDbm asDBMeta() {
+        return CrawlingInfoDbm.getInstance();
     }
 
     @Override
     public String asTableDbName() {
-        return "crawling_session";
+        return "crawling_info";
     }
 
     // ===================================================================================

src/main/java/org/codelibs/fess/es/config/bsentity/BsCrawlingInfoParam.java

@@ -15,18 +15,18 @@
  */
 package org.codelibs.fess.es.config.bsentity;
 
-import java.time.LocalDateTime;
+import java.time.*;
 import java.util.HashMap;
 import java.util.Map;
 
 import org.codelibs.fess.es.config.allcommon.EsAbstractEntity;
-import org.codelibs.fess.es.config.bsentity.dbmeta.CrawlingSessionInfoDbm;
+import org.codelibs.fess.es.config.bsentity.dbmeta.CrawlingInfoParamDbm;
 
 /**
  * ${table.comment}
  * @author ESFlute (using FreeGen)
  */
-public class BsCrawlingSessionInfo extends EsAbstractEntity {
+public class BsCrawlingInfoParam extends EsAbstractEntity {
 
     // ===================================================================================
     //                                                                          Definition
@@ -37,8 +37,8 @@ public class BsCrawlingSessionInfo extends EsAbstractEntity {
     // ===================================================================================
     //                                                                           Attribute
     //                                                                           =========
-    /** crawlingSessionId */
-    protected String crawlingSessionId;
+    /** crawlingInfoId */
+    protected String crawlingInfoId;
 
     /** createdTime */
     protected Long createdTime;
@@ -55,13 +55,13 @@ public class BsCrawlingSessionInfo extends EsAbstractEntity {
     //                                                                             DB Meta
     //                                                                             =======
     @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";
     }
 
     // ===================================================================================
@@ -70,8 +70,8 @@ public class BsCrawlingSessionInfo extends EsAbstractEntity {
     @Override
     public Map<String, Object> toSource() {
         Map<String, Object> 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() {

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;
 

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;
 

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;
 

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;
 

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;
 

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;
 

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;
 

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;
 

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;
 

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;
 

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;
 

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;
 

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;
 

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;
 

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;
 

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;
 

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;
 

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;
 

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;
 

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;
 

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;
 

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;
 

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;
 

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;
 

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<String, PropertyGateway> _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<ColumnInfo> ccil() {
         List<ColumnInfo> ls = newArrayList();
@@ -257,3 +212,4 @@ public class BoostDocumentRuleDbm extends AbstractDBMeta {
         return null;
     }
 }
+

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<String, PropertyGateway> _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<ColumnInfo> ccil() {
         List<ColumnInfo> 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<? extends Entity> 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;
     }
 }
+

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<String, PropertyGateway> _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<ColumnInfo> ccil() {
         List<ColumnInfo> 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<? extends Entity> 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;
     }
 }
+

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<String, PropertyGateway> _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<ColumnInfo> ccil() {
         List<ColumnInfo> ls = newArrayList();
@@ -291,3 +228,4 @@ public class DataConfigDbm extends AbstractDBMeta {
         return null;
     }
 }
+

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<String, PropertyGateway> _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<ColumnInfo> ccil() {
         List<ColumnInfo> ls = newArrayList();
@@ -212,3 +192,4 @@ public class DataConfigToLabelDbm extends AbstractDBMeta {
         return null;
     }
 }
+

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<String, PropertyGateway> _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<ColumnInfo> ccil() {
         List<ColumnInfo> ls = newArrayList();
@@ -212,3 +192,4 @@ public class DataConfigToRoleDbm extends AbstractDBMeta {
         return null;
     }
 }
+

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<String, PropertyGateway> _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<ColumnInfo> ccil() {
         List<ColumnInfo> ls = newArrayList();
@@ -257,3 +212,4 @@ public class DuplicateHostDbm extends AbstractDBMeta {
         return null;
     }
 }
+

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<String, PropertyGateway> _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<ColumnInfo> ccil() {
         List<ColumnInfo> ls = newArrayList();
@@ -256,3 +212,4 @@ public class FailureUrlDbm extends AbstractDBMeta {
         return null;
     }
 }
+

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<String, PropertyGateway> _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<ColumnInfo> ccil() {
         List<ColumnInfo> ls = newArrayList();
@@ -293,3 +228,4 @@ public class FileAuthenticationDbm extends AbstractDBMeta {
         return null;
     }
 }
+

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<String, PropertyGateway> _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<ColumnInfo> ccil() {
         List<ColumnInfo> ls = newArrayList();
@@ -361,3 +260,4 @@ public class FileConfigDbm extends AbstractDBMeta {
         return null;
     }
 }
+

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<String, PropertyGateway> _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<ColumnInfo> ccil() {
         List<ColumnInfo> ls = newArrayList();
@@ -212,3 +192,4 @@ public class FileConfigToLabelDbm extends AbstractDBMeta {
         return null;
     }
 }
+

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<String, PropertyGateway> _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<ColumnInfo> ccil() {
         List<ColumnInfo> ls = newArrayList();
@@ -212,3 +192,4 @@ public class FileConfigToRoleDbm extends AbstractDBMeta {
         return null;
     }
 }
+