Ver código fonte

add login link freegen files

matsutani 9 anos atrás
pai
commit
8269df3fc9
100 arquivos alterados com 973 adições e 2278 exclusões
  1. 37 94
      src/main/java/org/codelibs/fess/es/config/allcommon/EsAbstractBehavior.java
  2. 3 11
      src/main/java/org/codelibs/fess/es/config/allcommon/EsAbstractConditionBean.java
  3. 4 3
      src/main/java/org/codelibs/fess/es/config/allcommon/EsAbstractConditionQuery.java
  4. 1 0
      src/main/java/org/codelibs/fess/es/config/allcommon/EsAbstractEntity.java
  5. 1 0
      src/main/java/org/codelibs/fess/es/config/allcommon/EsPagingResultBean.java
  6. 4 2
      src/main/java/org/codelibs/fess/es/config/bsbhv/BsBadWordBhv.java
  7. 2 1
      src/main/java/org/codelibs/fess/es/config/bsbhv/BsBoostDocumentRuleBhv.java
  8. 4 2
      src/main/java/org/codelibs/fess/es/config/bsbhv/BsCrawlingInfoBhv.java
  9. 2 1
      src/main/java/org/codelibs/fess/es/config/bsbhv/BsCrawlingInfoParamBhv.java
  10. 4 2
      src/main/java/org/codelibs/fess/es/config/bsbhv/BsDataConfigBhv.java
  11. 2 1
      src/main/java/org/codelibs/fess/es/config/bsbhv/BsDataConfigToLabelBhv.java
  12. 2 1
      src/main/java/org/codelibs/fess/es/config/bsbhv/BsDataConfigToRoleBhv.java
  13. 4 2
      src/main/java/org/codelibs/fess/es/config/bsbhv/BsDuplicateHostBhv.java
  14. 4 2
      src/main/java/org/codelibs/fess/es/config/bsbhv/BsElevateWordBhv.java
  15. 2 1
      src/main/java/org/codelibs/fess/es/config/bsbhv/BsElevateWordToLabelBhv.java
  16. 4 2
      src/main/java/org/codelibs/fess/es/config/bsbhv/BsFailureUrlBhv.java
  17. 2 1
      src/main/java/org/codelibs/fess/es/config/bsbhv/BsFileAuthenticationBhv.java
  18. 4 2
      src/main/java/org/codelibs/fess/es/config/bsbhv/BsFileConfigBhv.java
  19. 2 1
      src/main/java/org/codelibs/fess/es/config/bsbhv/BsFileConfigToLabelBhv.java
  20. 2 1
      src/main/java/org/codelibs/fess/es/config/bsbhv/BsFileConfigToRoleBhv.java
  21. 4 2
      src/main/java/org/codelibs/fess/es/config/bsbhv/BsJobLogBhv.java
  22. 4 2
      src/main/java/org/codelibs/fess/es/config/bsbhv/BsKeyMatchBhv.java
  23. 4 2
      src/main/java/org/codelibs/fess/es/config/bsbhv/BsLabelToRoleBhv.java
  24. 4 2
      src/main/java/org/codelibs/fess/es/config/bsbhv/BsLabelTypeBhv.java
  25. 4 2
      src/main/java/org/codelibs/fess/es/config/bsbhv/BsPathMappingBhv.java
  26. 4 2
      src/main/java/org/codelibs/fess/es/config/bsbhv/BsRequestHeaderBhv.java
  27. 4 2
      src/main/java/org/codelibs/fess/es/config/bsbhv/BsRoleTypeBhv.java
  28. 4 2
      src/main/java/org/codelibs/fess/es/config/bsbhv/BsScheduledJobBhv.java
  29. 2 1
      src/main/java/org/codelibs/fess/es/config/bsbhv/BsWebAuthenticationBhv.java
  30. 4 2
      src/main/java/org/codelibs/fess/es/config/bsbhv/BsWebConfigBhv.java
  31. 2 1
      src/main/java/org/codelibs/fess/es/config/bsbhv/BsWebConfigToLabelBhv.java
  32. 2 1
      src/main/java/org/codelibs/fess/es/config/bsbhv/BsWebConfigToRoleBhv.java
  33. 1 1
      src/main/java/org/codelibs/fess/es/config/bsentity/BsBadWord.java
  34. 1 1
      src/main/java/org/codelibs/fess/es/config/bsentity/BsBoostDocumentRule.java
  35. 1 1
      src/main/java/org/codelibs/fess/es/config/bsentity/BsCrawlingInfo.java
  36. 1 1
      src/main/java/org/codelibs/fess/es/config/bsentity/BsCrawlingInfoParam.java
  37. 1 1
      src/main/java/org/codelibs/fess/es/config/bsentity/BsDataConfig.java
  38. 1 1
      src/main/java/org/codelibs/fess/es/config/bsentity/BsDataConfigToLabel.java
  39. 1 1
      src/main/java/org/codelibs/fess/es/config/bsentity/BsDataConfigToRole.java
  40. 1 1
      src/main/java/org/codelibs/fess/es/config/bsentity/BsDuplicateHost.java
  41. 1 1
      src/main/java/org/codelibs/fess/es/config/bsentity/BsElevateWord.java
  42. 1 1
      src/main/java/org/codelibs/fess/es/config/bsentity/BsElevateWordToLabel.java
  43. 1 1
      src/main/java/org/codelibs/fess/es/config/bsentity/BsFailureUrl.java
  44. 1 1
      src/main/java/org/codelibs/fess/es/config/bsentity/BsFileAuthentication.java
  45. 1 1
      src/main/java/org/codelibs/fess/es/config/bsentity/BsFileConfig.java
  46. 1 1
      src/main/java/org/codelibs/fess/es/config/bsentity/BsFileConfigToLabel.java
  47. 1 1
      src/main/java/org/codelibs/fess/es/config/bsentity/BsFileConfigToRole.java
  48. 1 1
      src/main/java/org/codelibs/fess/es/config/bsentity/BsJobLog.java
  49. 1 1
      src/main/java/org/codelibs/fess/es/config/bsentity/BsKeyMatch.java
  50. 1 1
      src/main/java/org/codelibs/fess/es/config/bsentity/BsLabelToRole.java
  51. 1 1
      src/main/java/org/codelibs/fess/es/config/bsentity/BsLabelType.java
  52. 1 1
      src/main/java/org/codelibs/fess/es/config/bsentity/BsPathMapping.java
  53. 1 1
      src/main/java/org/codelibs/fess/es/config/bsentity/BsRequestHeader.java
  54. 1 1
      src/main/java/org/codelibs/fess/es/config/bsentity/BsRoleType.java
  55. 1 1
      src/main/java/org/codelibs/fess/es/config/bsentity/BsScheduledJob.java
  56. 1 1
      src/main/java/org/codelibs/fess/es/config/bsentity/BsWebAuthentication.java
  57. 1 1
      src/main/java/org/codelibs/fess/es/config/bsentity/BsWebConfig.java
  58. 1 1
      src/main/java/org/codelibs/fess/es/config/bsentity/BsWebConfigToLabel.java
  59. 1 1
      src/main/java/org/codelibs/fess/es/config/bsentity/BsWebConfigToRole.java
  60. 29 73
      src/main/java/org/codelibs/fess/es/config/bsentity/dbmeta/BadWordDbm.java
  61. 29 73
      src/main/java/org/codelibs/fess/es/config/bsentity/dbmeta/BoostDocumentRuleDbm.java
  62. 19 47
      src/main/java/org/codelibs/fess/es/config/bsentity/dbmeta/CrawlingInfoDbm.java
  63. 19 48
      src/main/java/org/codelibs/fess/es/config/bsentity/dbmeta/CrawlingInfoParamDbm.java
  64. 44 111
      src/main/java/org/codelibs/fess/es/config/bsentity/dbmeta/DataConfigDbm.java
  65. 13 32
      src/main/java/org/codelibs/fess/es/config/bsentity/dbmeta/DataConfigToLabelDbm.java
  66. 13 32
      src/main/java/org/codelibs/fess/es/config/bsentity/dbmeta/DataConfigToRoleDbm.java
  67. 29 73
      src/main/java/org/codelibs/fess/es/config/bsentity/dbmeta/DuplicateHostDbm.java
  68. 35 88
      src/main/java/org/codelibs/fess/es/config/bsentity/dbmeta/ElevateWordDbm.java
  69. 13 32
      src/main/java/org/codelibs/fess/es/config/bsentity/dbmeta/ElevateWordToLabelDbm.java
  70. 29 72
      src/main/java/org/codelibs/fess/es/config/bsentity/dbmeta/FailureUrlDbm.java
  71. 41 105
      src/main/java/org/codelibs/fess/es/config/bsentity/dbmeta/FileAuthenticationDbm.java
  72. 68 173
      src/main/java/org/codelibs/fess/es/config/bsentity/dbmeta/FileConfigDbm.java
  73. 13 32
      src/main/java/org/codelibs/fess/es/config/bsentity/dbmeta/FileConfigToLabelDbm.java
  74. 13 32
      src/main/java/org/codelibs/fess/es/config/bsentity/dbmeta/FileConfigToRoleDbm.java
  75. 32 76
      src/main/java/org/codelibs/fess/es/config/bsentity/dbmeta/JobLogDbm.java
  76. 32 77
      src/main/java/org/codelibs/fess/es/config/bsentity/dbmeta/KeyMatchDbm.java
  77. 13 32
      src/main/java/org/codelibs/fess/es/config/bsentity/dbmeta/LabelToRoleDbm.java
  78. 38 95
      src/main/java/org/codelibs/fess/es/config/bsentity/dbmeta/LabelTypeDbm.java
  79. 32 80
      src/main/java/org/codelibs/fess/es/config/bsentity/dbmeta/PathMappingDbm.java
  80. 29 72
      src/main/java/org/codelibs/fess/es/config/bsentity/dbmeta/RequestHeaderDbm.java
  81. 29 71
      src/main/java/org/codelibs/fess/es/config/bsentity/dbmeta/RoleTypeDbm.java
  82. 47 120
      src/main/java/org/codelibs/fess/es/config/bsentity/dbmeta/ScheduledJobDbm.java
  83. 44 113
      src/main/java/org/codelibs/fess/es/config/bsentity/dbmeta/WebAuthenticationDbm.java
  84. 71 181
      src/main/java/org/codelibs/fess/es/config/bsentity/dbmeta/WebConfigDbm.java
  85. 13 32
      src/main/java/org/codelibs/fess/es/config/bsentity/dbmeta/WebConfigToLabelDbm.java
  86. 13 32
      src/main/java/org/codelibs/fess/es/config/bsentity/dbmeta/WebConfigToRoleDbm.java
  87. 1 7
      src/main/java/org/codelibs/fess/es/config/cbean/bs/BsBadWordCB.java
  88. 1 7
      src/main/java/org/codelibs/fess/es/config/cbean/bs/BsBoostDocumentRuleCB.java
  89. 1 4
      src/main/java/org/codelibs/fess/es/config/cbean/bs/BsCrawlingInfoCB.java
  90. 1 4
      src/main/java/org/codelibs/fess/es/config/cbean/bs/BsCrawlingInfoParamCB.java
  91. 1 12
      src/main/java/org/codelibs/fess/es/config/cbean/bs/BsDataConfigCB.java
  92. 1 2
      src/main/java/org/codelibs/fess/es/config/cbean/bs/BsDataConfigToLabelCB.java
  93. 1 2
      src/main/java/org/codelibs/fess/es/config/cbean/bs/BsDataConfigToRoleCB.java
  94. 1 7
      src/main/java/org/codelibs/fess/es/config/cbean/bs/BsDuplicateHostCB.java
  95. 1 9
      src/main/java/org/codelibs/fess/es/config/cbean/bs/BsElevateWordCB.java
  96. 1 2
      src/main/java/org/codelibs/fess/es/config/cbean/bs/BsElevateWordToLabelCB.java
  97. 1 7
      src/main/java/org/codelibs/fess/es/config/cbean/bs/BsFailureUrlCB.java
  98. 1 11
      src/main/java/org/codelibs/fess/es/config/cbean/bs/BsFileAuthenticationCB.java
  99. 1 20
      src/main/java/org/codelibs/fess/es/config/cbean/bs/BsFileConfigCB.java
  100. 1 2
      src/main/java/org/codelibs/fess/es/config/cbean/bs/BsFileConfigToLabelCB.java

+ 37 - 94
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;
@@ -42,12 +45,14 @@ import org.dbflute.util.DfTypeUtil;
 import org.elasticsearch.action.bulk.BulkItemResponse;
 import org.elasticsearch.action.bulk.BulkRequestBuilder;
 import org.elasticsearch.action.bulk.BulkResponse;
+import org.elasticsearch.action.count.CountRequestBuilder;
 import org.elasticsearch.action.delete.DeleteRequestBuilder;
 import org.elasticsearch.action.delete.DeleteResponse;
 import org.elasticsearch.action.index.IndexRequestBuilder;
 import org.elasticsearch.action.index.IndexResponse;
 import org.elasticsearch.action.search.SearchRequestBuilder;
 import org.elasticsearch.action.search.SearchResponse;
+import org.elasticsearch.action.search.SearchType;
 import org.elasticsearch.action.update.UpdateRequestBuilder;
 import org.elasticsearch.client.Client;
 import org.elasticsearch.search.SearchHit;
@@ -67,18 +72,10 @@ public abstract class EsAbstractBehavior<ENTITY extends Entity, CB extends Condi
     protected String scrollForDelete = "1m";
     protected int sizeForCursor = 100;
     protected String scrollForCursor = "1m";
-    protected String searchTimeout = "3m";
-    protected String indexTimeout = "3m";
-    protected String scrollSearchTimeout = "3m";
-    protected String bulkTimeout = "3m";
-    protected String deleteTimeout = "3m";
 
     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);
 
     // ===================================================================================
@@ -87,12 +84,8 @@ public abstract class EsAbstractBehavior<ENTITY extends Entity, CB extends Condi
     @Override
     protected int delegateSelectCountUniquely(final ConditionBean cb) {
         // #pending check response and cast problem
-        final SearchRequestBuilder builder = client.prepareSearch(asEsIndex()).setTypes(asEsSearchType());
-        final EsAbstractConditionBean esCb = (EsAbstractConditionBean) cb;
-        if (esCb.getPreference() != null) {
-            builder.setPreference(esCb.getPreference());
-        }
-        return (int) esCb.build(builder).execute().actionGet(searchTimeout).getHits().getTotalHits();
+        final CountRequestBuilder builder = client.prepareCount(asEsIndex()).setTypes(asEsSearchType());
+        return (int) ((EsAbstractConditionBean) cb).build(builder).execute().actionGet().getCount();
     }
 
     @Override
@@ -123,12 +116,8 @@ public abstract class EsAbstractBehavior<ENTITY extends Entity, CB extends Condi
         }
         builder.setFrom(from);
         builder.setSize(size);
-        final EsAbstractConditionBean esCb = (EsAbstractConditionBean) cb;
-        if (esCb.getPreference() != null) {
-            builder.setPreference(esCb.getPreference());
-        }
-        esCb.request().build(builder);
-        final SearchResponse response = esCb.build(builder).execute().actionGet(searchTimeout);
+        ((EsAbstractConditionBean) cb).request().build(builder);
+        final SearchResponse response = ((EsAbstractConditionBean) cb).build(builder).execute().actionGet();
 
         final EsPagingResultBean<RESULT> list = new EsPagingResultBean<>();
         final SearchHits searchHits = response.getHits();
@@ -203,24 +192,19 @@ public abstract class EsAbstractBehavior<ENTITY extends Entity, CB extends Condi
     }
 
     protected void delegateBulkRequest(final ConditionBean cb, Function<SearchHits, Boolean> handler) {
-        SearchResponse response = null;
-        while (true) {
-            if (response == null) {
-                final SearchRequestBuilder builder =
-                        client.prepareSearch(asEsIndex()).setTypes(asEsIndexType()).setScroll(scrollForCursor).setSize(sizeForCursor);
-                final EsAbstractConditionBean esCb = (EsAbstractConditionBean) cb;
-                if (esCb.getPreference() != null) {
-                    builder.setPreference(esCb.getPreference());
-                }
-                esCb.request().build(builder);
-                response = esCb.build(builder).execute().actionGet(scrollSearchTimeout);
-            } else {
-                final String scrollId = response.getScrollId();
-                response = client.prepareSearchScroll(scrollId).setScroll(scrollForDelete).execute().actionGet(scrollSearchTimeout);
-            }
-            final SearchHits searchHits = response.getHits();
+        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();
+
+        String scrollId = response.getScrollId();
+        while (scrollId != null) {
+            final SearchResponse scrollResponse = client.prepareSearchScroll(scrollId).setScroll(scrollForDelete).execute().actionGet();
+            scrollId = scrollResponse.getScrollId();
+            final SearchHits searchHits = scrollResponse.getHits();
             final SearchHit[] hits = searchHits.getHits();
             if (hits.length == 0) {
+                scrollId = null;
                 break;
             }
 
@@ -252,7 +236,7 @@ public abstract class EsAbstractBehavior<ENTITY extends Entity, CB extends Condi
         final EsAbstractEntity esEntity = (EsAbstractEntity) entity;
         IndexRequestBuilder builder = createInsertRequest(esEntity);
 
-        final IndexResponse response = builder.execute().actionGet(indexTimeout);
+        final IndexResponse response = builder.execute().actionGet();
         esEntity.asDocMeta().id(response.getId());
         return response.isCreated() ? 1 : 0;
     }
@@ -275,7 +259,7 @@ public abstract class EsAbstractBehavior<ENTITY extends Entity, CB extends Condi
         final EsAbstractEntity esEntity = (EsAbstractEntity) entity;
         final IndexRequestBuilder builder = createUpdateRequest(esEntity);
 
-        final IndexResponse response = builder.execute().actionGet(indexTimeout);
+        final IndexResponse response = builder.execute().actionGet();
         long version = response.getVersion();
         if (version != -1) {
             esEntity.asDocMeta().version(version);
@@ -302,7 +286,7 @@ public abstract class EsAbstractBehavior<ENTITY extends Entity, CB extends Condi
         final EsAbstractEntity esEntity = (EsAbstractEntity) entity;
         final DeleteRequestBuilder builder = createDeleteRequest(esEntity);
 
-        final DeleteResponse response = builder.execute().actionGet(deleteTimeout);
+        final DeleteResponse response = builder.execute().actionGet();
         return response.isFound() ? 1 : 0;
     }
 
@@ -317,25 +301,20 @@ public abstract class EsAbstractBehavior<ENTITY extends Entity, CB extends Condi
 
     @Override
     protected int delegateQueryDelete(final ConditionBean cb, final DeleteOption<? extends ConditionBean> option) {
-        SearchResponse response = null;
+        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();
+
         int count = 0;
-        while (true) {
-            if (response == null) {
-                final SearchRequestBuilder builder =
-                        client.prepareSearch(asEsIndex()).setTypes(asEsIndexType()).setScroll(scrollForDelete).setSize(sizeForDelete);
-                final EsAbstractConditionBean esCb = (EsAbstractConditionBean) cb;
-                if (esCb.getPreference() != null) {
-                    esCb.setPreference(esCb.getPreference());
-                }
-                esCb.request().build(builder);
-                response = esCb.build(builder).execute().actionGet(scrollSearchTimeout);
-            } else {
-                final String scrollId = response.getScrollId();
-                response = client.prepareSearchScroll(scrollId).setScroll(scrollForDelete).execute().actionGet(scrollSearchTimeout);
-            }
-            final SearchHits searchHits = response.getHits();
+        String scrollId = response.getScrollId();
+        while (scrollId != null) {
+            final SearchResponse scrollResponse = client.prepareSearchScroll(scrollId).setScroll(scrollForDelete).execute().actionGet();
+            scrollId = scrollResponse.getScrollId();
+            final SearchHits searchHits = scrollResponse.getHits();
             final SearchHit[] hits = searchHits.getHits();
             if (hits.length == 0) {
+                scrollId = null;
                 break;
             }
 
@@ -344,7 +323,7 @@ public abstract class EsAbstractBehavior<ENTITY extends Entity, CB extends Condi
                 bulkRequest.add(client.prepareDelete(asEsIndex(), asEsIndexType(), hit.getId()));
             }
             count += hits.length;
-            final BulkResponse bulkResponse = bulkRequest.execute().actionGet(bulkTimeout);
+            final BulkResponse bulkResponse = bulkRequest.execute().actionGet();
             if (bulkResponse.hasFailures()) {
                 throw new IllegalBehaviorStateException(bulkResponse.buildFailureMessage());
             }
@@ -409,7 +388,7 @@ public abstract class EsAbstractBehavior<ENTITY extends Entity, CB extends Condi
             builderCall.callback(bulkBuilder);
         }
 
-        final BulkResponse response = bulkBuilder.execute().actionGet(bulkTimeout);
+        final BulkResponse response = bulkBuilder.execute().actionGet();
         final BulkItemResponse[] itemResponses = response.getItems();
         if (itemResponses.length != entityList.size()) {
             throw new IllegalStateException("Invalid response size: " + itemResponses.length + " != " + entityList.size());
@@ -433,47 +412,10 @@ public abstract class EsAbstractBehavior<ENTITY extends Entity, CB extends Condi
         updateOption.xtoBeCompatibleBatchUpdateDefaultEveryColumn();
         return updateOption;
     }
-
     protected boolean isCompatibleBatchInsertDefaultEveryColumn() {
         return true;
     }
 
-    public void setSizeForDelete(int sizeForDelete) {
-        this.sizeForDelete = sizeForDelete;
-    }
-
-    public void setScrollForDelete(String scrollForDelete) {
-        this.scrollForDelete = scrollForDelete;
-    }
-
-    public void setSizeForCursor(int sizeForCursor) {
-        this.sizeForCursor = sizeForCursor;
-    }
-
-    public void setScrollForCursor(String scrollForCursor) {
-        this.scrollForCursor = scrollForCursor;
-    }
-
-    public void setSearchTimeout(String searchTimeout) {
-        this.searchTimeout = searchTimeout;
-    }
-
-    public void setIndexTimeout(String indexTimeout) {
-        this.indexTimeout = indexTimeout;
-    }
-
-    public void setScrollSearchTimeout(String scrollSearchTimeout) {
-        this.scrollSearchTimeout = scrollSearchTimeout;
-    }
-
-    public void setBulkTimeout(String bulkTimeout) {
-        this.bulkTimeout = bulkTimeout;
-    }
-
-    public void setDeleteTimeout(String deleteTimeout) {
-        this.deleteTimeout = deleteTimeout;
-    }
-
     // ===================================================================================
     //                                                                        Assist Logic
     //                                                                        ============
@@ -613,3 +555,4 @@ public abstract class EsAbstractBehavior<ENTITY extends Entity, CB extends Condi
         }
     }
 }
+

+ 3 - 11
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;
@@ -51,14 +52,12 @@ public abstract class EsAbstractConditionBean implements ConditionBean {
     //                                                                           =========
     protected final SqlClause _sqlClause = new EsSqlClause(asTableDbName());
     protected int _safetyMaxResultSize;
-    protected SearchRequestParams _searchRequestParams = new SearchRequestParams();
-    protected String _preference;
+    private SearchRequestParams _searchRequestParams = new SearchRequestParams();
 
     // ===================================================================================
     //                                                                             Builder
     //                                                                             =======
     public abstract CountRequestBuilder build(CountRequestBuilder builder);
-
     public abstract SearchRequestBuilder build(SearchRequestBuilder builder);
 
     // ===================================================================================
@@ -600,14 +599,6 @@ public abstract class EsAbstractConditionBean implements ConditionBean {
         return _searchRequestParams;
     }
 
-    public void setPreference(final String preference) {
-        _preference = preference;
-    }
-
-    public String getPreference() {
-        return _preference;
-    }
-
     // ===================================================================================
     //                                                                      General Helper
     //                                                                      ==============
@@ -707,3 +698,4 @@ public abstract class EsAbstractConditionBean implements ConditionBean {
         }
     }
 }
+

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

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

+ 1 - 0
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;
     }
 }
+

+ 4 - 2
src/main/java/org/codelibs/fess/es/config/bsbhv/BsBadWordBhv.java

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

+ 2 - 1
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());
     }
 
     // ===================================================================================
@@ -267,3 +267,4 @@ public abstract class BsBoostDocumentRuleBhv extends EsAbstractBehavior<BoostDoc
 
     // #pending create, modify, remove
 }
+

+ 4 - 2
src/main/java/org/codelibs/fess/es/config/bsbhv/BsCrawlingInfoBhv.java

@@ -100,7 +100,8 @@ public abstract class BsCrawlingInfoBhv extends EsAbstractBehavior<CrawlingInfo,
         return doSelectOptionalEntity(cb, typeOfSelectedEntity());
     }
 
-    protected <ENTITY extends CrawlingInfo> OptionalEntity<ENTITY> doSelectOptionalEntity(CrawlingInfoCB cb, Class<? extends ENTITY> tp) {
+    protected <ENTITY extends CrawlingInfo> OptionalEntity<ENTITY> doSelectOptionalEntity(CrawlingInfoCB cb,
+            Class<? extends ENTITY> tp) {
         return createOptionalEntity(doSelectEntity(cb, tp), cb);
     }
 
@@ -168,7 +169,7 @@ public abstract class BsCrawlingInfoBhv extends EsAbstractBehavior<CrawlingInfo,
     }
 
     public void selectBulk(CBCall<CrawlingInfoCB> cbLambda, EntityRowHandler<List<CrawlingInfo>> entityLambda) {
-        delegateSelectBulk(createCB(cbLambda), entityLambda, typeOfSelectedEntity());
+        delegateSelectBulk(createCB(cbLambda), entityLambda,typeOfSelectedEntity());
     }
 
     // ===================================================================================
@@ -263,3 +264,4 @@ public abstract class BsCrawlingInfoBhv extends EsAbstractBehavior<CrawlingInfo,
 
     // #pending create, modify, remove
 }
+

+ 2 - 1
src/main/java/org/codelibs/fess/es/config/bsbhv/BsCrawlingInfoParamBhv.java

@@ -169,7 +169,7 @@ public abstract class BsCrawlingInfoParamBhv extends EsAbstractBehavior<Crawling
     }
 
     public void selectBulk(CBCall<CrawlingInfoParamCB> cbLambda, EntityRowHandler<List<CrawlingInfoParam>> entityLambda) {
-        delegateSelectBulk(createCB(cbLambda), entityLambda, typeOfSelectedEntity());
+        delegateSelectBulk(createCB(cbLambda), entityLambda,typeOfSelectedEntity());
     }
 
     // ===================================================================================
@@ -264,3 +264,4 @@ public abstract class BsCrawlingInfoParamBhv extends EsAbstractBehavior<Crawling
 
     // #pending create, modify, remove
 }
+

+ 4 - 2
src/main/java/org/codelibs/fess/es/config/bsbhv/BsDataConfigBhv.java

@@ -108,7 +108,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);
     }
 
@@ -176,7 +177,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());
     }
 
     // ===================================================================================
@@ -271,3 +272,4 @@ public abstract class BsDataConfigBhv extends EsAbstractBehavior<DataConfig, Dat
 
     // #pending create, modify, remove
 }
+

+ 2 - 1
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());
     }
 
     // ===================================================================================
@@ -262,3 +262,4 @@ public abstract class BsDataConfigToLabelBhv extends EsAbstractBehavior<DataConf
 
     // #pending create, modify, remove
 }
+

+ 2 - 1
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());
     }
 
     // ===================================================================================
@@ -262,3 +262,4 @@ public abstract class BsDataConfigToRoleBhv extends EsAbstractBehavior<DataConfi
 
     // #pending create, modify, remove
 }
+

+ 4 - 2
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());
     }
 
     // ===================================================================================
@@ -266,3 +267,4 @@ public abstract class BsDuplicateHostBhv extends EsAbstractBehavior<DuplicateHos
 
     // #pending create, modify, remove
 }
+

+ 4 - 2
src/main/java/org/codelibs/fess/es/config/bsbhv/BsElevateWordBhv.java

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

+ 2 - 1
src/main/java/org/codelibs/fess/es/config/bsbhv/BsElevateWordToLabelBhv.java

@@ -167,7 +167,7 @@ public abstract class BsElevateWordToLabelBhv extends EsAbstractBehavior<Elevate
     }
 
     public void selectBulk(CBCall<ElevateWordToLabelCB> cbLambda, EntityRowHandler<List<ElevateWordToLabel>> entityLambda) {
-        delegateSelectBulk(createCB(cbLambda), entityLambda, typeOfSelectedEntity());
+        delegateSelectBulk(createCB(cbLambda), entityLambda,typeOfSelectedEntity());
     }
 
     // ===================================================================================
@@ -262,3 +262,4 @@ public abstract class BsElevateWordToLabelBhv extends EsAbstractBehavior<Elevate
 
     // #pending create, modify, remove
 }
+

+ 4 - 2
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());
     }
 
     // ===================================================================================
@@ -266,3 +267,4 @@ public abstract class BsFailureUrlBhv extends EsAbstractBehavior<FailureUrl, Fai
 
     // #pending create, modify, remove
 }
+

+ 2 - 1
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());
     }
 
     // ===================================================================================
@@ -271,3 +271,4 @@ public abstract class BsFileAuthenticationBhv extends EsAbstractBehavior<FileAut
 
     // #pending create, modify, remove
 }
+

+ 4 - 2
src/main/java/org/codelibs/fess/es/config/bsbhv/BsFileConfigBhv.java

@@ -116,7 +116,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);
     }
 
@@ -184,7 +185,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());
     }
 
     // ===================================================================================
@@ -279,3 +280,4 @@ public abstract class BsFileConfigBhv extends EsAbstractBehavior<FileConfig, Fil
 
     // #pending create, modify, remove
 }
+

+ 2 - 1
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());
     }
 
     // ===================================================================================
@@ -262,3 +262,4 @@ public abstract class BsFileConfigToLabelBhv extends EsAbstractBehavior<FileConf
 
     // #pending create, modify, remove
 }
+

+ 2 - 1
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());
     }
 
     // ===================================================================================
@@ -262,3 +262,4 @@ public abstract class BsFileConfigToRoleBhv extends EsAbstractBehavior<FileConfi
 
     // #pending create, modify, remove
 }
+

+ 4 - 2
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());
     }
 
     // ===================================================================================
@@ -267,3 +268,4 @@ public abstract class BsJobLogBhv extends EsAbstractBehavior<JobLog, JobLogCB> {
 
     // #pending create, modify, remove
 }
+

+ 4 - 2
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());
     }
 
     // ===================================================================================
@@ -267,3 +268,4 @@ public abstract class BsKeyMatchBhv extends EsAbstractBehavior<KeyMatch, KeyMatc
 
     // #pending create, modify, remove
 }
+

+ 4 - 2
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());
     }
 
     // ===================================================================================
@@ -261,3 +262,4 @@ public abstract class BsLabelToRoleBhv extends EsAbstractBehavior<LabelToRole, L
 
     // #pending create, modify, remove
 }
+

+ 4 - 2
src/main/java/org/codelibs/fess/es/config/bsbhv/BsLabelTypeBhv.java

@@ -106,7 +106,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);
     }
 
@@ -174,7 +175,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());
     }
 
     // ===================================================================================
@@ -269,3 +270,4 @@ public abstract class BsLabelTypeBhv extends EsAbstractBehavior<LabelType, Label
 
     // #pending create, modify, remove
 }
+

+ 4 - 2
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());
     }
 
     // ===================================================================================
@@ -267,3 +268,4 @@ public abstract class BsPathMappingBhv extends EsAbstractBehavior<PathMapping, P
 
     // #pending create, modify, remove
 }
+

+ 4 - 2
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());
     }
 
     // ===================================================================================
@@ -266,3 +267,4 @@ public abstract class BsRequestHeaderBhv extends EsAbstractBehavior<RequestHeade
 
     // #pending create, modify, remove
 }
+

+ 4 - 2
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());
     }
 
     // ===================================================================================
@@ -266,3 +267,4 @@ public abstract class BsRoleTypeBhv extends EsAbstractBehavior<RoleType, RoleTyp
 
     // #pending create, modify, remove
 }
+

+ 4 - 2
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());
     }
 
     // ===================================================================================
@@ -272,3 +273,4 @@ public abstract class BsScheduledJobBhv extends EsAbstractBehavior<ScheduledJob,
 
     // #pending create, modify, remove
 }
+

+ 2 - 1
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());
     }
 
     // ===================================================================================
@@ -272,3 +272,4 @@ public abstract class BsWebAuthenticationBhv extends EsAbstractBehavior<WebAuthe
 
     // #pending create, modify, remove
 }
+

+ 4 - 2
src/main/java/org/codelibs/fess/es/config/bsbhv/BsWebConfigBhv.java

@@ -117,7 +117,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);
     }
 
@@ -185,7 +186,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());
     }
 
     // ===================================================================================
@@ -280,3 +281,4 @@ public abstract class BsWebConfigBhv extends EsAbstractBehavior<WebConfig, WebCo
 
     // #pending create, modify, remove
 }
+

+ 2 - 1
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());
     }
 
     // ===================================================================================
@@ -262,3 +262,4 @@ public abstract class BsWebConfigToLabelBhv extends EsAbstractBehavior<WebConfig
 
     // #pending create, modify, remove
 }
+

+ 2 - 1
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());
     }
 
     // ===================================================================================
@@ -262,3 +262,4 @@ public abstract class BsWebConfigToRoleBhv extends EsAbstractBehavior<WebConfigT
 
     // #pending create, modify, remove
 }
+

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

+ 1 - 1
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;
 

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

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

+ 1 - 1
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;
 

+ 1 - 1
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;
 

+ 1 - 1
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;
 

+ 1 - 1
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;
 

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

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

+ 1 - 1
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;
 

+ 1 - 1
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;
 

+ 1 - 1
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;
 

+ 1 - 1
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;
 

+ 1 - 1
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;
 

+ 1 - 1
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;
 

+ 1 - 1
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;
 

+ 1 - 1
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;
 

+ 1 - 1
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;
 

+ 1 - 1
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;
 

+ 1 - 1
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;
 

+ 1 - 1
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;
 

+ 1 - 1
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;
 

+ 1 - 1
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;
 

+ 1 - 1
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;
 

+ 1 - 1
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;
 

+ 1 - 1
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;
 

+ 29 - 73
src/main/java/org/codelibs/fess/es/config/bsentity/dbmeta/BadWordDbm.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.BadWord;
+
 import org.dbflute.Entity;
 import org.dbflute.dbmeta.AbstractDBMeta;
 import org.dbflute.dbmeta.info.ColumnInfo;
@@ -79,20 +80,13 @@ public class BadWordDbm extends AbstractDBMeta {
     //                                       ---------------
     protected final Map<String, PropertyGateway> _epgMap = newHashMap();
     {
-        setupEpg(_epgMap, et -> ((BadWord) et).getCreatedBy(), (et, vl) -> ((BadWord) et).setCreatedBy(DfTypeUtil.toString(vl)),
-                "createdBy");
-        setupEpg(_epgMap, et -> ((BadWord) et).getCreatedTime(), (et, vl) -> ((BadWord) et).setCreatedTime(DfTypeUtil.toLong(vl)),
-                "createdTime");
-        setupEpg(_epgMap, et -> ((BadWord) et).getSuggestWord(), (et, vl) -> ((BadWord) et).setSuggestWord(DfTypeUtil.toString(vl)),
-                "suggestWord");
-        setupEpg(_epgMap, et -> ((BadWord) et).getTargetLabel(), (et, vl) -> ((BadWord) et).setTargetLabel(DfTypeUtil.toString(vl)),
-                "targetLabel");
-        setupEpg(_epgMap, et -> ((BadWord) et).getTargetRole(), (et, vl) -> ((BadWord) et).setTargetRole(DfTypeUtil.toString(vl)),
-                "targetRole");
-        setupEpg(_epgMap, et -> ((BadWord) et).getUpdatedBy(), (et, vl) -> ((BadWord) et).setUpdatedBy(DfTypeUtil.toString(vl)),
-                "updatedBy");
-        setupEpg(_epgMap, et -> ((BadWord) et).getUpdatedTime(), (et, vl) -> ((BadWord) et).setUpdatedTime(DfTypeUtil.toLong(vl)),
-                "updatedTime");
+        setupEpg(_epgMap, et-> ((BadWord)et).getCreatedBy(),(et,vl)->((BadWord) et).setCreatedBy(DfTypeUtil.toString(vl)), "createdBy");
+        setupEpg(_epgMap, et-> ((BadWord)et).getCreatedTime(),(et,vl)->((BadWord) et).setCreatedTime(DfTypeUtil.toLong(vl)), "createdTime");
+        setupEpg(_epgMap, et-> ((BadWord)et).getSuggestWord(),(et,vl)->((BadWord) et).setSuggestWord(DfTypeUtil.toString(vl)), "suggestWord");
+        setupEpg(_epgMap, et-> ((BadWord)et).getTargetLabel(),(et,vl)->((BadWord) et).setTargetLabel(DfTypeUtil.toString(vl)), "targetLabel");
+        setupEpg(_epgMap, et-> ((BadWord)et).getTargetRole(),(et,vl)->((BadWord) et).setTargetRole(DfTypeUtil.toString(vl)), "targetRole");
+        setupEpg(_epgMap, et-> ((BadWord)et).getUpdatedBy(),(et,vl)->((BadWord) et).setUpdatedBy(DfTypeUtil.toString(vl)), "updatedBy");
+        setupEpg(_epgMap, et-> ((BadWord)et).getUpdatedTime(),(et,vl)->((BadWord) et).setUpdatedTime(DfTypeUtil.toLong(vl)), "updatedTime");
     }
 
     @Override
@@ -106,71 +100,32 @@ public class BadWordDbm extends AbstractDBMeta {
     protected final String _tableDbName = "bad_word";
     protected final String _tableDispName = "bad_word";
     protected final String _tablePropertyName = "BadWord";
-
-    public String getTableDbName() {
-        return _tableDbName;
-    }
-
+    public String getTableDbName() { return _tableDbName; }
     @Override
-    public String getTableDispName() {
-        return _tableDispName;
-    }
-
+    public String getTableDispName() { return _tableDispName; }
     @Override
-    public String getTablePropertyName() {
-        return _tablePropertyName;
-    }
-
+    public String getTablePropertyName() { return _tablePropertyName; }
     @Override
-    public TableSqlName getTableSqlName() {
-        return null;
-    }
+    public TableSqlName getTableSqlName() { return null; }
 
     // ===================================================================================
     //                                                                         Column Info
     //                                                                         ===========
-    protected final ColumnInfo _columnCreatedBy = cci("createdBy", "createdBy", null, null, String.class, "createdBy", null, false, false,
-            false, "String", 0, 0, null, false, null, null, null, null, null, false);
-    protected final ColumnInfo _columnCreatedTime = cci("createdTime", "createdTime", null, null, Long.class, "createdTime", null, false,
-            false, false, "Long", 0, 0, null, false, null, null, null, null, null, false);
-    protected final ColumnInfo _columnSuggestWord = cci("suggestWord", "suggestWord", null, null, String.class, "suggestWord", null, false,
-            false, false, "String", 0, 0, null, false, null, null, null, null, null, false);
-    protected final ColumnInfo _columnTargetLabel = cci("targetLabel", "targetLabel", null, null, String.class, "targetLabel", null, false,
-            false, false, "String", 0, 0, null, false, null, null, null, null, null, false);
-    protected final ColumnInfo _columnTargetRole = cci("targetRole", "targetRole", null, null, String.class, "targetRole", null, false,
-            false, false, "String", 0, 0, null, false, null, null, null, null, null, false);
-    protected final ColumnInfo _columnUpdatedBy = cci("updatedBy", "updatedBy", null, null, String.class, "updatedBy", null, false, false,
-            false, "String", 0, 0, null, false, null, null, null, null, null, false);
-    protected final ColumnInfo _columnUpdatedTime = cci("updatedTime", "updatedTime", null, null, Long.class, "updatedTime", null, false,
-            false, false, "Long", 0, 0, null, false, null, null, null, null, null, false);
-
-    public ColumnInfo columnCreatedBy() {
-        return _columnCreatedBy;
-    }
-
-    public ColumnInfo columnCreatedTime() {
-        return _columnCreatedTime;
-    }
-
-    public ColumnInfo columnSuggestWord() {
-        return _columnSuggestWord;
-    }
-
-    public ColumnInfo columnTargetLabel() {
-        return _columnTargetLabel;
-    }
-
-    public ColumnInfo columnTargetRole() {
-        return _columnTargetRole;
-    }
-
-    public ColumnInfo columnUpdatedBy() {
-        return _columnUpdatedBy;
-    }
-
-    public ColumnInfo columnUpdatedTime() {
-        return _columnUpdatedTime;
-    }
+    protected final ColumnInfo _columnCreatedBy = cci("createdBy", "createdBy", null, null, String.class, "createdBy", null, false, false, false, "String", 0, 0, null, false, null, null, null, null, null, false);
+    protected final ColumnInfo _columnCreatedTime = cci("createdTime", "createdTime", null, null, Long.class, "createdTime", null, false, false, false, "Long", 0, 0, null, false, null, null, null, null, null, false);
+    protected final ColumnInfo _columnSuggestWord = cci("suggestWord", "suggestWord", null, null, String.class, "suggestWord", null, false, false, false, "String", 0, 0, null, false, null, null, null, null, null, false);
+    protected final ColumnInfo _columnTargetLabel = cci("targetLabel", "targetLabel", null, null, String.class, "targetLabel", null, false, false, false, "String", 0, 0, null, false, null, null, null, null, null, false);
+    protected final ColumnInfo _columnTargetRole = cci("targetRole", "targetRole", null, null, String.class, "targetRole", null, false, false, false, "String", 0, 0, null, false, null, null, null, null, null, false);
+    protected final ColumnInfo _columnUpdatedBy = cci("updatedBy", "updatedBy", null, null, String.class, "updatedBy", null, false, false, false, "String", 0, 0, null, false, null, null, null, null, null, false);
+    protected final ColumnInfo _columnUpdatedTime = cci("updatedTime", "updatedTime", null, null, Long.class, "updatedTime", null, false, false, false, "Long", 0, 0, null, false, null, null, null, null, null, false);
+
+    public ColumnInfo columnCreatedBy() { return _columnCreatedBy; }
+    public ColumnInfo columnCreatedTime() { return _columnCreatedTime; }
+    public ColumnInfo columnSuggestWord() { return _columnSuggestWord; }
+    public ColumnInfo columnTargetLabel() { return _columnTargetLabel; }
+    public ColumnInfo columnTargetRole() { return _columnTargetRole; }
+    public ColumnInfo columnUpdatedBy() { return _columnUpdatedBy; }
+    public ColumnInfo columnUpdatedTime() { return _columnUpdatedTime; }
 
     protected List<ColumnInfo> ccil() {
         List<ColumnInfo> ls = newArrayList();
@@ -257,3 +212,4 @@ public class BadWordDbm extends AbstractDBMeta {
         return null;
     }
 }
+

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

+ 19 - 47
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.CrawlingInfo;
+
 import org.dbflute.Entity;
 import org.dbflute.dbmeta.AbstractDBMeta;
 import org.dbflute.dbmeta.info.ColumnInfo;
@@ -79,13 +80,10 @@ public class CrawlingInfoDbm extends AbstractDBMeta {
     //                                       ---------------
     protected final Map<String, PropertyGateway> _epgMap = newHashMap();
     {
-        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");
+        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
@@ -99,53 +97,26 @@ public class CrawlingInfoDbm extends AbstractDBMeta {
     protected final String _tableDbName = "crawling_info";
     protected final String _tableDispName = "crawling_info";
     protected final String _tablePropertyName = "CrawlingInfo";
-
-    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 _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();
@@ -229,3 +200,4 @@ public class CrawlingInfoDbm extends AbstractDBMeta {
         return null;
     }
 }
+

+ 19 - 48
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.CrawlingInfoParam;
+
 import org.dbflute.Entity;
 import org.dbflute.dbmeta.AbstractDBMeta;
 import org.dbflute.dbmeta.info.ColumnInfo;
@@ -79,14 +80,10 @@ public class CrawlingInfoParamDbm extends AbstractDBMeta {
     //                                       ---------------
     protected final Map<String, PropertyGateway> _epgMap = newHashMap();
     {
-        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");
+        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
@@ -100,53 +97,26 @@ public class CrawlingInfoParamDbm extends AbstractDBMeta {
     protected final String _tableDbName = "crawling_info_param";
     protected final String _tableDispName = "crawling_info_param";
     protected final String _tablePropertyName = "CrawlingInfoParam";
-
-    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 _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);
+    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 columnCrawlingInfoId() {
-        return _columnCrawlingInfoId;
-    }
-
-    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();
@@ -230,3 +200,4 @@ public class CrawlingInfoParamDbm extends AbstractDBMeta {
         return null;
     }
 }
+

+ 44 - 111
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,28 +80,18 @@ 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).getPermissions(), (et, vl) -> ((DataConfig) et).setPermissions((String[]) vl),
-                "permissions");
-        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).getPermissions(),(et,vl)->((DataConfig) et).setPermissions((String[])vl), "permissions");
+        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
@@ -114,101 +105,42 @@ 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 _columnPermissions = cci("permissions", "permissions", null, null, String[].class, "permissions", 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 columnPermissions() {
-        return _columnPermissions;
-    }
-
-    public ColumnInfo columnSortOrder() {
-        return _columnSortOrder;
-    }
-
-    public ColumnInfo columnUpdatedBy() {
-        return _columnUpdatedBy;
-    }
-
-    public ColumnInfo columnUpdatedTime() {
-        return _columnUpdatedTime;
-    }
+    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 _columnPermissions = cci("permissions", "permissions", null, null, String[].class, "permissions", 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 columnPermissions() { return _columnPermissions; }
+    public ColumnInfo columnSortOrder() { return _columnSortOrder; }
+    public ColumnInfo columnUpdatedBy() { return _columnUpdatedBy; }
+    public ColumnInfo columnUpdatedTime() { return _columnUpdatedTime; }
 
     protected List<ColumnInfo> ccil() {
         List<ColumnInfo> ls = newArrayList();
@@ -300,3 +232,4 @@ public class DataConfigDbm extends AbstractDBMeta {
         return null;
     }
 }
+

+ 13 - 32
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;
     }
 }
+

+ 13 - 32
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;
     }
 }
+

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

+ 35 - 88
src/main/java/org/codelibs/fess/es/config/bsentity/dbmeta/ElevateWordDbm.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.ElevateWord;
+
 import org.dbflute.Entity;
 import org.dbflute.dbmeta.AbstractDBMeta;
 import org.dbflute.dbmeta.info.ColumnInfo;
@@ -79,23 +80,15 @@ public class ElevateWordDbm extends AbstractDBMeta {
     //                                       ---------------
     protected final Map<String, PropertyGateway> _epgMap = newHashMap();
     {
-        setupEpg(_epgMap, et -> ((ElevateWord) et).getBoost(), (et, vl) -> ((ElevateWord) et).setBoost(DfTypeUtil.toFloat(vl)), "boost");
-        setupEpg(_epgMap, et -> ((ElevateWord) et).getCreatedBy(), (et, vl) -> ((ElevateWord) et).setCreatedBy(DfTypeUtil.toString(vl)),
-                "createdBy");
-        setupEpg(_epgMap, et -> ((ElevateWord) et).getCreatedTime(), (et, vl) -> ((ElevateWord) et).setCreatedTime(DfTypeUtil.toLong(vl)),
-                "createdTime");
-        setupEpg(_epgMap, et -> ((ElevateWord) et).getReading(), (et, vl) -> ((ElevateWord) et).setReading(DfTypeUtil.toString(vl)),
-                "reading");
-        setupEpg(_epgMap, et -> ((ElevateWord) et).getSuggestWord(),
-                (et, vl) -> ((ElevateWord) et).setSuggestWord(DfTypeUtil.toString(vl)), "suggestWord");
-        setupEpg(_epgMap, et -> ((ElevateWord) et).getTargetLabel(),
-                (et, vl) -> ((ElevateWord) et).setTargetLabel(DfTypeUtil.toString(vl)), "targetLabel");
-        setupEpg(_epgMap, et -> ((ElevateWord) et).getTargetRole(), (et, vl) -> ((ElevateWord) et).setTargetRole(DfTypeUtil.toString(vl)),
-                "targetRole");
-        setupEpg(_epgMap, et -> ((ElevateWord) et).getUpdatedBy(), (et, vl) -> ((ElevateWord) et).setUpdatedBy(DfTypeUtil.toString(vl)),
-                "updatedBy");
-        setupEpg(_epgMap, et -> ((ElevateWord) et).getUpdatedTime(), (et, vl) -> ((ElevateWord) et).setUpdatedTime(DfTypeUtil.toLong(vl)),
-                "updatedTime");
+        setupEpg(_epgMap, et-> ((ElevateWord)et).getBoost(),(et,vl)->((ElevateWord) et).setBoost(DfTypeUtil.toFloat(vl)), "boost");
+        setupEpg(_epgMap, et-> ((ElevateWord)et).getCreatedBy(),(et,vl)->((ElevateWord) et).setCreatedBy(DfTypeUtil.toString(vl)), "createdBy");
+        setupEpg(_epgMap, et-> ((ElevateWord)et).getCreatedTime(),(et,vl)->((ElevateWord) et).setCreatedTime(DfTypeUtil.toLong(vl)), "createdTime");
+        setupEpg(_epgMap, et-> ((ElevateWord)et).getReading(),(et,vl)->((ElevateWord) et).setReading(DfTypeUtil.toString(vl)), "reading");
+        setupEpg(_epgMap, et-> ((ElevateWord)et).getSuggestWord(),(et,vl)->((ElevateWord) et).setSuggestWord(DfTypeUtil.toString(vl)), "suggestWord");
+        setupEpg(_epgMap, et-> ((ElevateWord)et).getTargetLabel(),(et,vl)->((ElevateWord) et).setTargetLabel(DfTypeUtil.toString(vl)), "targetLabel");
+        setupEpg(_epgMap, et-> ((ElevateWord)et).getTargetRole(),(et,vl)->((ElevateWord) et).setTargetRole(DfTypeUtil.toString(vl)), "targetRole");
+        setupEpg(_epgMap, et-> ((ElevateWord)et).getUpdatedBy(),(et,vl)->((ElevateWord) et).setUpdatedBy(DfTypeUtil.toString(vl)), "updatedBy");
+        setupEpg(_epgMap, et-> ((ElevateWord)et).getUpdatedTime(),(et,vl)->((ElevateWord) et).setUpdatedTime(DfTypeUtil.toLong(vl)), "updatedTime");
     }
 
     @Override
@@ -109,83 +102,36 @@ public class ElevateWordDbm extends AbstractDBMeta {
     protected final String _tableDbName = "elevate_word";
     protected final String _tableDispName = "elevate_word";
     protected final String _tablePropertyName = "ElevateWord";
-
-    public String getTableDbName() {
-        return _tableDbName;
-    }
-
+    public String getTableDbName() { return _tableDbName; }
     @Override
-    public String getTableDispName() {
-        return _tableDispName;
-    }
-
+    public String getTableDispName() { return _tableDispName; }
     @Override
-    public String getTablePropertyName() {
-        return _tablePropertyName;
-    }
-
+    public String getTablePropertyName() { return _tablePropertyName; }
     @Override
-    public TableSqlName getTableSqlName() {
-        return null;
-    }
+    public TableSqlName getTableSqlName() { return null; }
 
     // ===================================================================================
     //                                                                         Column Info
     //                                                                         ===========
-    protected final ColumnInfo _columnBoost = cci("boost", "boost", null, null, Float.class, "boost", null, false, false, false, "Float",
-            0, 0, null, false, null, null, null, null, null, false);
-    protected final ColumnInfo _columnCreatedBy = cci("createdBy", "createdBy", null, null, String.class, "createdBy", null, false, false,
-            false, "String", 0, 0, null, false, null, null, null, null, null, false);
-    protected final ColumnInfo _columnCreatedTime = cci("createdTime", "createdTime", null, null, Long.class, "createdTime", null, false,
-            false, false, "Long", 0, 0, null, false, null, null, null, null, null, false);
-    protected final ColumnInfo _columnReading = cci("reading", "reading", null, null, String.class, "reading", null, false, false, false,
-            "String", 0, 0, null, false, null, null, null, null, null, false);
-    protected final ColumnInfo _columnSuggestWord = cci("suggestWord", "suggestWord", null, null, String.class, "suggestWord", null, false,
-            false, false, "String", 0, 0, null, false, null, null, null, null, null, false);
-    protected final ColumnInfo _columnTargetLabel = cci("targetLabel", "targetLabel", null, null, String.class, "targetLabel", null, false,
-            false, false, "String", 0, 0, null, false, null, null, null, null, null, false);
-    protected final ColumnInfo _columnTargetRole = cci("targetRole", "targetRole", null, null, String.class, "targetRole", null, false,
-            false, false, "String", 0, 0, null, false, null, null, null, null, null, false);
-    protected final ColumnInfo _columnUpdatedBy = cci("updatedBy", "updatedBy", null, null, String.class, "updatedBy", null, false, false,
-            false, "String", 0, 0, null, false, null, null, null, null, null, false);
-    protected final ColumnInfo _columnUpdatedTime = cci("updatedTime", "updatedTime", null, null, Long.class, "updatedTime", null, false,
-            false, false, "Long", 0, 0, null, false, null, null, null, null, null, false);
-
-    public ColumnInfo columnBoost() {
-        return _columnBoost;
-    }
-
-    public ColumnInfo columnCreatedBy() {
-        return _columnCreatedBy;
-    }
-
-    public ColumnInfo columnCreatedTime() {
-        return _columnCreatedTime;
-    }
-
-    public ColumnInfo columnReading() {
-        return _columnReading;
-    }
-
-    public ColumnInfo columnSuggestWord() {
-        return _columnSuggestWord;
-    }
-
-    public ColumnInfo columnTargetLabel() {
-        return _columnTargetLabel;
-    }
-
-    public ColumnInfo columnTargetRole() {
-        return _columnTargetRole;
-    }
-
-    public ColumnInfo columnUpdatedBy() {
-        return _columnUpdatedBy;
-    }
-
-    public ColumnInfo columnUpdatedTime() {
-        return _columnUpdatedTime;
-    }
+    protected final ColumnInfo _columnBoost = cci("boost", "boost", null, null, Float.class, "boost", null, false, false, false, "Float", 0, 0, null, false, null, null, null, null, null, false);
+    protected final ColumnInfo _columnCreatedBy = cci("createdBy", "createdBy", null, null, String.class, "createdBy", null, false, false, false, "String", 0, 0, null, false, null, null, null, null, null, false);
+    protected final ColumnInfo _columnCreatedTime = cci("createdTime", "createdTime", null, null, Long.class, "createdTime", null, false, false, false, "Long", 0, 0, null, false, null, null, null, null, null, false);
+    protected final ColumnInfo _columnReading = cci("reading", "reading", null, null, String.class, "reading", null, false, false, false, "String", 0, 0, null, false, null, null, null, null, null, false);
+    protected final ColumnInfo _columnSuggestWord = cci("suggestWord", "suggestWord", null, null, String.class, "suggestWord", null, false, false, false, "String", 0, 0, null, false, null, null, null, null, null, false);
+    protected final ColumnInfo _columnTargetLabel = cci("targetLabel", "targetLabel", null, null, String.class, "targetLabel", null, false, false, false, "String", 0, 0, null, false, null, null, null, null, null, false);
+    protected final ColumnInfo _columnTargetRole = cci("targetRole", "targetRole", null, null, String.class, "targetRole", null, false, false, false, "String", 0, 0, null, false, null, null, null, null, null, false);
+    protected final ColumnInfo _columnUpdatedBy = cci("updatedBy", "updatedBy", null, null, String.class, "updatedBy", null, false, false, false, "String", 0, 0, null, false, null, null, null, null, null, false);
+    protected final ColumnInfo _columnUpdatedTime = cci("updatedTime", "updatedTime", null, null, Long.class, "updatedTime", null, false, false, false, "Long", 0, 0, null, false, null, null, null, null, null, false);
+
+    public ColumnInfo columnBoost() { return _columnBoost; }
+    public ColumnInfo columnCreatedBy() { return _columnCreatedBy; }
+    public ColumnInfo columnCreatedTime() { return _columnCreatedTime; }
+    public ColumnInfo columnReading() { return _columnReading; }
+    public ColumnInfo columnSuggestWord() { return _columnSuggestWord; }
+    public ColumnInfo columnTargetLabel() { return _columnTargetLabel; }
+    public ColumnInfo columnTargetRole() { return _columnTargetRole; }
+    public ColumnInfo columnUpdatedBy() { return _columnUpdatedBy; }
+    public ColumnInfo columnUpdatedTime() { return _columnUpdatedTime; }
 
     protected List<ColumnInfo> ccil() {
         List<ColumnInfo> ls = newArrayList();
@@ -274,3 +220,4 @@ public class ElevateWordDbm extends AbstractDBMeta {
         return null;
     }
 }
+

+ 13 - 32
src/main/java/org/codelibs/fess/es/config/bsentity/dbmeta/ElevateWordToLabelDbm.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.ElevateWordToLabel;
+
 import org.dbflute.Entity;
 import org.dbflute.dbmeta.AbstractDBMeta;
 import org.dbflute.dbmeta.info.ColumnInfo;
@@ -79,10 +80,8 @@ public class ElevateWordToLabelDbm extends AbstractDBMeta {
     //                                       ---------------
     protected final Map<String, PropertyGateway> _epgMap = newHashMap();
     {
-        setupEpg(_epgMap, et -> ((ElevateWordToLabel) et).getElevateWordId(),
-                (et, vl) -> ((ElevateWordToLabel) et).setElevateWordId(DfTypeUtil.toString(vl)), "elevateWordId");
-        setupEpg(_epgMap, et -> ((ElevateWordToLabel) et).getLabelTypeId(),
-                (et, vl) -> ((ElevateWordToLabel) et).setLabelTypeId(DfTypeUtil.toString(vl)), "labelTypeId");
+        setupEpg(_epgMap, et-> ((ElevateWordToLabel)et).getElevateWordId(),(et,vl)->((ElevateWordToLabel) et).setElevateWordId(DfTypeUtil.toString(vl)), "elevateWordId");
+        setupEpg(_epgMap, et-> ((ElevateWordToLabel)et).getLabelTypeId(),(et,vl)->((ElevateWordToLabel) et).setLabelTypeId(DfTypeUtil.toString(vl)), "labelTypeId");
     }
 
     @Override
@@ -96,41 +95,22 @@ public class ElevateWordToLabelDbm extends AbstractDBMeta {
     protected final String _tableDbName = "elevate_word_to_label";
     protected final String _tableDispName = "elevate_word_to_label";
     protected final String _tablePropertyName = "ElevateWordToLabel";
-
-    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 _columnElevateWordId = cci("elevateWordId", "elevateWordId", null, null, String.class, "elevateWordId",
-            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 _columnElevateWordId = cci("elevateWordId", "elevateWordId", null, null, String.class, "elevateWordId", 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 columnElevateWordId() {
-        return _columnElevateWordId;
-    }
-
-    public ColumnInfo columnLabelTypeId() {
-        return _columnLabelTypeId;
-    }
+    public ColumnInfo columnElevateWordId() { return _columnElevateWordId; }
+    public ColumnInfo columnLabelTypeId() { return _columnLabelTypeId; }
 
     protected List<ColumnInfo> ccil() {
         List<ColumnInfo> ls = newArrayList();
@@ -212,3 +192,4 @@ public class ElevateWordToLabelDbm extends AbstractDBMeta {
         return null;
     }
 }
+

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

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

+ 68 - 173
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,42 +80,26 @@ 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).getPermissions(), (et, vl) -> ((FileConfig) et).setPermissions((String[]) vl),
-                "permissions");
-        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).getPermissions(),(et,vl)->((FileConfig) et).setPermissions((String[])vl), "permissions");
+        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
@@ -128,149 +113,58 @@ 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 _columnPermissions = cci("permissions", "permissions", null, null, String[].class, "permissions", 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 columnPermissions() {
-        return _columnPermissions;
-    }
-
-    public ColumnInfo columnSortOrder() {
-        return _columnSortOrder;
-    }
-
-    public ColumnInfo columnUpdatedBy() {
-        return _columnUpdatedBy;
-    }
-
-    public ColumnInfo columnUpdatedTime() {
-        return _columnUpdatedTime;
-    }
+    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 _columnPermissions = cci("permissions", "permissions", null, null, String[].class, "permissions", 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 columnPermissions() { return _columnPermissions; }
+    public ColumnInfo columnSortOrder() { return _columnSortOrder; }
+    public ColumnInfo columnUpdatedBy() { return _columnUpdatedBy; }
+    public ColumnInfo columnUpdatedTime() { return _columnUpdatedTime; }
 
     protected List<ColumnInfo> ccil() {
         List<ColumnInfo> ls = newArrayList();
@@ -370,3 +264,4 @@ public class FileConfigDbm extends AbstractDBMeta {
         return null;
     }
 }
+

+ 13 - 32
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;
     }
 }
+

+ 13 - 32
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;
     }
 }
+

+ 32 - 76
src/main/java/org/codelibs/fess/es/config/bsentity/dbmeta/JobLogDbm.java

@@ -15,11 +15,12 @@
  */
 package org.codelibs.fess.es.config.bsentity.dbmeta;
 
-import java.time.LocalDateTime;
+import java.time.*;
 import java.util.List;
 import java.util.Map;
 
 import org.codelibs.fess.es.config.exentity.JobLog;
+
 import org.dbflute.Entity;
 import org.dbflute.dbmeta.AbstractDBMeta;
 import org.dbflute.dbmeta.info.ColumnInfo;
@@ -79,17 +80,14 @@ public class JobLogDbm extends AbstractDBMeta {
     //                                       ---------------
     protected final Map<String, PropertyGateway> _epgMap = newHashMap();
     {
-        setupEpg(_epgMap, et -> ((JobLog) et).getEndTime(), (et, vl) -> ((JobLog) et).setEndTime(DfTypeUtil.toLong(vl)), "endTime");
-        setupEpg(_epgMap, et -> ((JobLog) et).getJobName(), (et, vl) -> ((JobLog) et).setJobName(DfTypeUtil.toString(vl)), "jobName");
-        setupEpg(_epgMap, et -> ((JobLog) et).getJobStatus(), (et, vl) -> ((JobLog) et).setJobStatus(DfTypeUtil.toString(vl)), "jobStatus");
-        setupEpg(_epgMap, et -> ((JobLog) et).getScriptData(), (et, vl) -> ((JobLog) et).setScriptData(DfTypeUtil.toString(vl)),
-                "scriptData");
-        setupEpg(_epgMap, et -> ((JobLog) et).getScriptResult(), (et, vl) -> ((JobLog) et).setScriptResult(DfTypeUtil.toString(vl)),
-                "scriptResult");
-        setupEpg(_epgMap, et -> ((JobLog) et).getScriptType(), (et, vl) -> ((JobLog) et).setScriptType(DfTypeUtil.toString(vl)),
-                "scriptType");
-        setupEpg(_epgMap, et -> ((JobLog) et).getStartTime(), (et, vl) -> ((JobLog) et).setStartTime(DfTypeUtil.toLong(vl)), "startTime");
-        setupEpg(_epgMap, et -> ((JobLog) et).getTarget(), (et, vl) -> ((JobLog) et).setTarget(DfTypeUtil.toString(vl)), "target");
+        setupEpg(_epgMap, et-> ((JobLog)et).getEndTime(),(et,vl)->((JobLog) et).setEndTime(DfTypeUtil.toLong(vl)), "endTime");
+        setupEpg(_epgMap, et-> ((JobLog)et).getJobName(),(et,vl)->((JobLog) et).setJobName(DfTypeUtil.toString(vl)), "jobName");
+        setupEpg(_epgMap, et-> ((JobLog)et).getJobStatus(),(et,vl)->((JobLog) et).setJobStatus(DfTypeUtil.toString(vl)), "jobStatus");
+        setupEpg(_epgMap, et-> ((JobLog)et).getScriptData(),(et,vl)->((JobLog) et).setScriptData(DfTypeUtil.toString(vl)), "scriptData");
+        setupEpg(_epgMap, et-> ((JobLog)et).getScriptResult(),(et,vl)->((JobLog) et).setScriptResult(DfTypeUtil.toString(vl)), "scriptResult");
+        setupEpg(_epgMap, et-> ((JobLog)et).getScriptType(),(et,vl)->((JobLog) et).setScriptType(DfTypeUtil.toString(vl)), "scriptType");
+        setupEpg(_epgMap, et-> ((JobLog)et).getStartTime(),(et,vl)->((JobLog) et).setStartTime(DfTypeUtil.toLong(vl)), "startTime");
+        setupEpg(_epgMap, et-> ((JobLog)et).getTarget(),(et,vl)->((JobLog) et).setTarget(DfTypeUtil.toString(vl)), "target");
     }
 
     @Override
@@ -103,77 +101,34 @@ public class JobLogDbm extends AbstractDBMeta {
     protected final String _tableDbName = "job_log";
     protected final String _tableDispName = "job_log";
     protected final String _tablePropertyName = "JobLog";
-
-    public String getTableDbName() {
-        return _tableDbName;
-    }
-
+    public String getTableDbName() { return _tableDbName; }
     @Override
-    public String getTableDispName() {
-        return _tableDispName;
-    }
-
+    public String getTableDispName() { return _tableDispName; }
     @Override
-    public String getTablePropertyName() {
-        return _tablePropertyName;
-    }
-
+    public String getTablePropertyName() { return _tablePropertyName; }
     @Override
-    public TableSqlName getTableSqlName() {
-        return null;
-    }
+    public TableSqlName getTableSqlName() { return null; }
 
     // ===================================================================================
     //                                                                         Column Info
     //                                                                         ===========
-    protected final ColumnInfo _columnEndTime = cci("endTime", "endTime", null, null, Long.class, "endTime", null, false, false, false,
-            "Long", 0, 0, null, false, null, null, null, null, null, false);
-    protected final ColumnInfo _columnJobName = cci("jobName", "jobName", null, null, String.class, "jobName", null, false, false, false,
-            "String", 0, 0, null, false, null, null, null, null, null, false);
-    protected final ColumnInfo _columnJobStatus = cci("jobStatus", "jobStatus", null, null, String.class, "jobStatus", null, false, false,
-            false, "String", 0, 0, null, false, null, null, null, null, null, false);
-    protected final ColumnInfo _columnScriptData = cci("scriptData", "scriptData", null, null, String.class, "scriptData", null, false,
-            false, false, "String", 0, 0, null, false, null, null, null, null, null, false);
-    protected final ColumnInfo _columnScriptResult = cci("scriptResult", "scriptResult", null, null, String.class, "scriptResult", null,
-            false, false, false, "String", 0, 0, null, false, null, null, null, null, null, false);
-    protected final ColumnInfo _columnScriptType = cci("scriptType", "scriptType", null, null, String.class, "scriptType", null, false,
-            false, false, "String", 0, 0, null, false, null, null, null, null, null, false);
-    protected final ColumnInfo _columnStartTime = cci("startTime", "startTime", null, null, Long.class, "startTime", null, false, false,
-            false, "Long", 0, 0, null, false, null, null, null, null, null, false);
-    protected final ColumnInfo _columnTarget = cci("target", "target", null, null, String.class, "target", null, false, false, false,
-            "String", 0, 0, null, false, null, null, null, null, null, false);
-
-    public ColumnInfo columnEndTime() {
-        return _columnEndTime;
-    }
-
-    public ColumnInfo columnJobName() {
-        return _columnJobName;
-    }
-
-    public ColumnInfo columnJobStatus() {
-        return _columnJobStatus;
-    }
-
-    public ColumnInfo columnScriptData() {
-        return _columnScriptData;
-    }
-
-    public ColumnInfo columnScriptResult() {
-        return _columnScriptResult;
-    }
-
-    public ColumnInfo columnScriptType() {
-        return _columnScriptType;
-    }
-
-    public ColumnInfo columnStartTime() {
-        return _columnStartTime;
-    }
-
-    public ColumnInfo columnTarget() {
-        return _columnTarget;
-    }
+    protected final ColumnInfo _columnEndTime = cci("endTime", "endTime", null, null, Long.class, "endTime", null, false, false, false, "Long", 0, 0, null, false, null, null, null, null, null, false);
+    protected final ColumnInfo _columnJobName = cci("jobName", "jobName", null, null, String.class, "jobName", null, false, false, false, "String", 0, 0, null, false, null, null, null, null, null, false);
+    protected final ColumnInfo _columnJobStatus = cci("jobStatus", "jobStatus", null, null, String.class, "jobStatus", null, false, false, false, "String", 0, 0, null, false, null, null, null, null, null, false);
+    protected final ColumnInfo _columnScriptData = cci("scriptData", "scriptData", null, null, String.class, "scriptData", null, false, false, false, "String", 0, 0, null, false, null, null, null, null, null, false);
+    protected final ColumnInfo _columnScriptResult = cci("scriptResult", "scriptResult", null, null, String.class, "scriptResult", null, false, false, false, "String", 0, 0, null, false, null, null, null, null, null, false);
+    protected final ColumnInfo _columnScriptType = cci("scriptType", "scriptType", null, null, String.class, "scriptType", null, false, false, false, "String", 0, 0, null, false, null, null, null, null, null, false);
+    protected final ColumnInfo _columnStartTime = cci("startTime", "startTime", null, null, Long.class, "startTime", null, false, false, false, "Long", 0, 0, null, false, null, null, null, null, null, false);
+    protected final ColumnInfo _columnTarget = cci("target", "target", null, null, String.class, "target", null, false, false, false, "String", 0, 0, null, false, null, null, null, null, null, false);
+
+    public ColumnInfo columnEndTime() { return _columnEndTime; }
+    public ColumnInfo columnJobName() { return _columnJobName; }
+    public ColumnInfo columnJobStatus() { return _columnJobStatus; }
+    public ColumnInfo columnScriptData() { return _columnScriptData; }
+    public ColumnInfo columnScriptResult() { return _columnScriptResult; }
+    public ColumnInfo columnScriptType() { return _columnScriptType; }
+    public ColumnInfo columnStartTime() { return _columnStartTime; }
+    public ColumnInfo columnTarget() { return _columnTarget; }
 
     protected List<ColumnInfo> ccil() {
         List<ColumnInfo> ls = newArrayList();
@@ -261,3 +216,4 @@ public class JobLogDbm extends AbstractDBMeta {
         return null;
     }
 }
+

+ 32 - 77
src/main/java/org/codelibs/fess/es/config/bsentity/dbmeta/KeyMatchDbm.java

@@ -15,11 +15,12 @@
  */
 package org.codelibs.fess.es.config.bsentity.dbmeta;
 
-import java.time.LocalDateTime;
+import java.time.*;
 import java.util.List;
 import java.util.Map;
 
 import org.codelibs.fess.es.config.exentity.KeyMatch;
+
 import org.dbflute.Entity;
 import org.dbflute.dbmeta.AbstractDBMeta;
 import org.dbflute.dbmeta.info.ColumnInfo;
@@ -79,18 +80,14 @@ public class KeyMatchDbm extends AbstractDBMeta {
     //                                       ---------------
     protected final Map<String, PropertyGateway> _epgMap = newHashMap();
     {
-        setupEpg(_epgMap, et -> ((KeyMatch) et).getBoost(), (et, vl) -> ((KeyMatch) et).setBoost(DfTypeUtil.toFloat(vl)), "boost");
-        setupEpg(_epgMap, et -> ((KeyMatch) et).getCreatedBy(), (et, vl) -> ((KeyMatch) et).setCreatedBy(DfTypeUtil.toString(vl)),
-                "createdBy");
-        setupEpg(_epgMap, et -> ((KeyMatch) et).getCreatedTime(), (et, vl) -> ((KeyMatch) et).setCreatedTime(DfTypeUtil.toLong(vl)),
-                "createdTime");
-        setupEpg(_epgMap, et -> ((KeyMatch) et).getMaxSize(), (et, vl) -> ((KeyMatch) et).setMaxSize(DfTypeUtil.toInteger(vl)), "maxSize");
-        setupEpg(_epgMap, et -> ((KeyMatch) et).getQuery(), (et, vl) -> ((KeyMatch) et).setQuery(DfTypeUtil.toString(vl)), "query");
-        setupEpg(_epgMap, et -> ((KeyMatch) et).getTerm(), (et, vl) -> ((KeyMatch) et).setTerm(DfTypeUtil.toString(vl)), "term");
-        setupEpg(_epgMap, et -> ((KeyMatch) et).getUpdatedBy(), (et, vl) -> ((KeyMatch) et).setUpdatedBy(DfTypeUtil.toString(vl)),
-                "updatedBy");
-        setupEpg(_epgMap, et -> ((KeyMatch) et).getUpdatedTime(), (et, vl) -> ((KeyMatch) et).setUpdatedTime(DfTypeUtil.toLong(vl)),
-                "updatedTime");
+        setupEpg(_epgMap, et-> ((KeyMatch)et).getBoost(),(et,vl)->((KeyMatch) et).setBoost(DfTypeUtil.toFloat(vl)), "boost");
+        setupEpg(_epgMap, et-> ((KeyMatch)et).getCreatedBy(),(et,vl)->((KeyMatch) et).setCreatedBy(DfTypeUtil.toString(vl)), "createdBy");
+        setupEpg(_epgMap, et-> ((KeyMatch)et).getCreatedTime(),(et,vl)->((KeyMatch) et).setCreatedTime(DfTypeUtil.toLong(vl)), "createdTime");
+        setupEpg(_epgMap, et-> ((KeyMatch)et).getMaxSize(),(et,vl)->((KeyMatch) et).setMaxSize(DfTypeUtil.toInteger(vl)), "maxSize");
+        setupEpg(_epgMap, et-> ((KeyMatch)et).getQuery(),(et,vl)->((KeyMatch) et).setQuery(DfTypeUtil.toString(vl)), "query");
+        setupEpg(_epgMap, et-> ((KeyMatch)et).getTerm(),(et,vl)->((KeyMatch) et).setTerm(DfTypeUtil.toString(vl)), "term");
+        setupEpg(_epgMap, et-> ((KeyMatch)et).getUpdatedBy(),(et,vl)->((KeyMatch) et).setUpdatedBy(DfTypeUtil.toString(vl)), "updatedBy");
+        setupEpg(_epgMap, et-> ((KeyMatch)et).getUpdatedTime(),(et,vl)->((KeyMatch) et).setUpdatedTime(DfTypeUtil.toLong(vl)), "updatedTime");
     }
 
     @Override
@@ -104,77 +101,34 @@ public class KeyMatchDbm extends AbstractDBMeta {
     protected final String _tableDbName = "key_match";
     protected final String _tableDispName = "key_match";
     protected final String _tablePropertyName = "KeyMatch";
-
-    public String getTableDbName() {
-        return _tableDbName;
-    }
-
+    public String getTableDbName() { return _tableDbName; }
     @Override
-    public String getTableDispName() {
-        return _tableDispName;
-    }
-
+    public String getTableDispName() { return _tableDispName; }
     @Override
-    public String getTablePropertyName() {
-        return _tablePropertyName;
-    }
-
+    public String getTablePropertyName() { return _tablePropertyName; }
     @Override
-    public TableSqlName getTableSqlName() {
-        return null;
-    }
+    public TableSqlName getTableSqlName() { return null; }
 
     // ===================================================================================
     //                                                                         Column Info
     //                                                                         ===========
-    protected final ColumnInfo _columnBoost = cci("boost", "boost", null, null, Float.class, "boost", null, false, false, false, "Float",
-            0, 0, null, false, null, null, null, null, null, false);
-    protected final ColumnInfo _columnCreatedBy = cci("createdBy", "createdBy", null, null, String.class, "createdBy", null, false, false,
-            false, "String", 0, 0, null, false, null, null, null, null, null, false);
-    protected final ColumnInfo _columnCreatedTime = cci("createdTime", "createdTime", null, null, Long.class, "createdTime", null, false,
-            false, false, "Long", 0, 0, null, false, null, null, null, null, null, false);
-    protected final ColumnInfo _columnMaxSize = cci("maxSize", "maxSize", null, null, Integer.class, "maxSize", null, false, false, false,
-            "Integer", 0, 0, null, false, null, null, null, null, null, false);
-    protected final ColumnInfo _columnQuery = cci("query", "query", null, null, String.class, "query", null, false, false, false, "String",
-            0, 0, null, false, null, null, null, null, null, false);
-    protected final ColumnInfo _columnTerm = cci("term", "term", null, null, String.class, "term", null, false, false, false, "String", 0,
-            0, null, false, null, null, null, null, null, false);
-    protected final ColumnInfo _columnUpdatedBy = cci("updatedBy", "updatedBy", null, null, String.class, "updatedBy", null, false, false,
-            false, "String", 0, 0, null, false, null, null, null, null, null, false);
-    protected final ColumnInfo _columnUpdatedTime = cci("updatedTime", "updatedTime", null, null, Long.class, "updatedTime", null, false,
-            false, false, "Long", 0, 0, null, false, null, null, null, null, null, false);
-
-    public ColumnInfo columnBoost() {
-        return _columnBoost;
-    }
-
-    public ColumnInfo columnCreatedBy() {
-        return _columnCreatedBy;
-    }
-
-    public ColumnInfo columnCreatedTime() {
-        return _columnCreatedTime;
-    }
-
-    public ColumnInfo columnMaxSize() {
-        return _columnMaxSize;
-    }
-
-    public ColumnInfo columnQuery() {
-        return _columnQuery;
-    }
-
-    public ColumnInfo columnTerm() {
-        return _columnTerm;
-    }
-
-    public ColumnInfo columnUpdatedBy() {
-        return _columnUpdatedBy;
-    }
-
-    public ColumnInfo columnUpdatedTime() {
-        return _columnUpdatedTime;
-    }
+    protected final ColumnInfo _columnBoost = cci("boost", "boost", null, null, Float.class, "boost", null, false, false, false, "Float", 0, 0, null, false, null, null, null, null, null, false);
+    protected final ColumnInfo _columnCreatedBy = cci("createdBy", "createdBy", null, null, String.class, "createdBy", null, false, false, false, "String", 0, 0, null, false, null, null, null, null, null, false);
+    protected final ColumnInfo _columnCreatedTime = cci("createdTime", "createdTime", null, null, Long.class, "createdTime", null, false, false, false, "Long", 0, 0, null, false, null, null, null, null, null, false);
+    protected final ColumnInfo _columnMaxSize = cci("maxSize", "maxSize", null, null, Integer.class, "maxSize", null, false, false, false, "Integer", 0, 0, null, false, null, null, null, null, null, false);
+    protected final ColumnInfo _columnQuery = cci("query", "query", null, null, String.class, "query", null, false, false, false, "String", 0, 0, null, false, null, null, null, null, null, false);
+    protected final ColumnInfo _columnTerm = cci("term", "term", null, null, String.class, "term", null, false, false, false, "String", 0, 0, null, false, null, null, null, null, null, false);
+    protected final ColumnInfo _columnUpdatedBy = cci("updatedBy", "updatedBy", null, null, String.class, "updatedBy", null, false, false, false, "String", 0, 0, null, false, null, null, null, null, null, false);
+    protected final ColumnInfo _columnUpdatedTime = cci("updatedTime", "updatedTime", null, null, Long.class, "updatedTime", null, false, false, false, "Long", 0, 0, null, false, null, null, null, null, null, false);
+
+    public ColumnInfo columnBoost() { return _columnBoost; }
+    public ColumnInfo columnCreatedBy() { return _columnCreatedBy; }
+    public ColumnInfo columnCreatedTime() { return _columnCreatedTime; }
+    public ColumnInfo columnMaxSize() { return _columnMaxSize; }
+    public ColumnInfo columnQuery() { return _columnQuery; }
+    public ColumnInfo columnTerm() { return _columnTerm; }
+    public ColumnInfo columnUpdatedBy() { return _columnUpdatedBy; }
+    public ColumnInfo columnUpdatedTime() { return _columnUpdatedTime; }
 
     protected List<ColumnInfo> ccil() {
         List<ColumnInfo> ls = newArrayList();
@@ -262,3 +216,4 @@ public class KeyMatchDbm extends AbstractDBMeta {
         return null;
     }
 }
+

+ 13 - 32
src/main/java/org/codelibs/fess/es/config/bsentity/dbmeta/LabelToRoleDbm.java

@@ -15,11 +15,12 @@
  */
 package org.codelibs.fess.es.config.bsentity.dbmeta;
 
-import java.time.LocalDateTime;
+import java.time.*;
 import java.util.List;
 import java.util.Map;
 
 import org.codelibs.fess.es.config.exentity.LabelToRole;
+
 import org.dbflute.Entity;
 import org.dbflute.dbmeta.AbstractDBMeta;
 import org.dbflute.dbmeta.info.ColumnInfo;
@@ -79,10 +80,8 @@ public class LabelToRoleDbm extends AbstractDBMeta {
     //                                       ---------------
     protected final Map<String, PropertyGateway> _epgMap = newHashMap();
     {
-        setupEpg(_epgMap, et -> ((LabelToRole) et).getLabelTypeId(),
-                (et, vl) -> ((LabelToRole) et).setLabelTypeId(DfTypeUtil.toString(vl)), "labelTypeId");
-        setupEpg(_epgMap, et -> ((LabelToRole) et).getRoleTypeId(), (et, vl) -> ((LabelToRole) et).setRoleTypeId(DfTypeUtil.toString(vl)),
-                "roleTypeId");
+        setupEpg(_epgMap, et-> ((LabelToRole)et).getLabelTypeId(),(et,vl)->((LabelToRole) et).setLabelTypeId(DfTypeUtil.toString(vl)), "labelTypeId");
+        setupEpg(_epgMap, et-> ((LabelToRole)et).getRoleTypeId(),(et,vl)->((LabelToRole) et).setRoleTypeId(DfTypeUtil.toString(vl)), "roleTypeId");
     }
 
     @Override
@@ -96,41 +95,22 @@ public class LabelToRoleDbm extends AbstractDBMeta {
     protected final String _tableDbName = "label_to_role";
     protected final String _tableDispName = "label_to_role";
     protected final String _tablePropertyName = "LabelToRole";
-
-    public String getTableDbName() {
-        return _tableDbName;
-    }
-
+    public String getTableDbName() { return _tableDbName; }
     @Override
-    public String getTableDispName() {
-        return _tableDispName;
-    }
-
+    public String getTableDispName() { return _tableDispName; }
     @Override
-    public String getTablePropertyName() {
-        return _tablePropertyName;
-    }
-
+    public String getTablePropertyName() { return _tablePropertyName; }
     @Override
-    public TableSqlName getTableSqlName() {
-        return null;
-    }
+    public TableSqlName getTableSqlName() { return null; }
 
     // ===================================================================================
     //                                                                         Column Info
     //                                                                         ===========
-    protected final ColumnInfo _columnLabelTypeId = cci("labelTypeId", "labelTypeId", null, null, String.class, "labelTypeId", null, false,
-            false, false, "String", 0, 0, null, false, null, null, null, null, null, false);
-    protected final ColumnInfo _columnRoleTypeId = cci("roleTypeId", "roleTypeId", null, null, String.class, "roleTypeId", null, false,
-            false, false, "String", 0, 0, null, false, null, null, null, null, null, false);
+    protected final ColumnInfo _columnLabelTypeId = cci("labelTypeId", "labelTypeId", null, null, String.class, "labelTypeId", null, false, false, false, "String", 0, 0, null, false, null, null, null, null, null, false);
+    protected final ColumnInfo _columnRoleTypeId = cci("roleTypeId", "roleTypeId", null, null, String.class, "roleTypeId", null, false, false, false, "String", 0, 0, null, false, null, null, null, null, null, false);
 
-    public ColumnInfo columnLabelTypeId() {
-        return _columnLabelTypeId;
-    }
-
-    public ColumnInfo columnRoleTypeId() {
-        return _columnRoleTypeId;
-    }
+    public ColumnInfo columnLabelTypeId() { return _columnLabelTypeId; }
+    public ColumnInfo columnRoleTypeId() { return _columnRoleTypeId; }
 
     protected List<ColumnInfo> ccil() {
         List<ColumnInfo> ls = newArrayList();
@@ -212,3 +192,4 @@ public class LabelToRoleDbm extends AbstractDBMeta {
         return null;
     }
 }
+

+ 38 - 95
src/main/java/org/codelibs/fess/es/config/bsentity/dbmeta/LabelTypeDbm.java

@@ -15,11 +15,12 @@
  */
 package org.codelibs.fess.es.config.bsentity.dbmeta;
 
-import java.time.LocalDateTime;
+import java.time.*;
 import java.util.List;
 import java.util.Map;
 
 import org.codelibs.fess.es.config.exentity.LabelType;
+
 import org.dbflute.Entity;
 import org.dbflute.dbmeta.AbstractDBMeta;
 import org.dbflute.dbmeta.info.ColumnInfo;
@@ -79,24 +80,16 @@ public class LabelTypeDbm extends AbstractDBMeta {
     //                                       ---------------
     protected final Map<String, PropertyGateway> _epgMap = newHashMap();
     {
-        setupEpg(_epgMap, et -> ((LabelType) et).getCreatedBy(), (et, vl) -> ((LabelType) et).setCreatedBy(DfTypeUtil.toString(vl)),
-                "createdBy");
-        setupEpg(_epgMap, et -> ((LabelType) et).getCreatedTime(), (et, vl) -> ((LabelType) et).setCreatedTime(DfTypeUtil.toLong(vl)),
-                "createdTime");
-        setupEpg(_epgMap, et -> ((LabelType) et).getExcludedPaths(),
-                (et, vl) -> ((LabelType) et).setExcludedPaths(DfTypeUtil.toString(vl)), "excludedPaths");
-        setupEpg(_epgMap, et -> ((LabelType) et).getIncludedPaths(),
-                (et, vl) -> ((LabelType) et).setIncludedPaths(DfTypeUtil.toString(vl)), "includedPaths");
-        setupEpg(_epgMap, et -> ((LabelType) et).getName(), (et, vl) -> ((LabelType) et).setName(DfTypeUtil.toString(vl)), "name");
-        setupEpg(_epgMap, et -> ((LabelType) et).getPermissions(), (et, vl) -> ((LabelType) et).setPermissions((String[]) vl),
-                "permissions");
-        setupEpg(_epgMap, et -> ((LabelType) et).getSortOrder(), (et, vl) -> ((LabelType) et).setSortOrder(DfTypeUtil.toInteger(vl)),
-                "sortOrder");
-        setupEpg(_epgMap, et -> ((LabelType) et).getUpdatedBy(), (et, vl) -> ((LabelType) et).setUpdatedBy(DfTypeUtil.toString(vl)),
-                "updatedBy");
-        setupEpg(_epgMap, et -> ((LabelType) et).getUpdatedTime(), (et, vl) -> ((LabelType) et).setUpdatedTime(DfTypeUtil.toLong(vl)),
-                "updatedTime");
-        setupEpg(_epgMap, et -> ((LabelType) et).getValue(), (et, vl) -> ((LabelType) et).setValue(DfTypeUtil.toString(vl)), "value");
+        setupEpg(_epgMap, et-> ((LabelType)et).getCreatedBy(),(et,vl)->((LabelType) et).setCreatedBy(DfTypeUtil.toString(vl)), "createdBy");
+        setupEpg(_epgMap, et-> ((LabelType)et).getCreatedTime(),(et,vl)->((LabelType) et).setCreatedTime(DfTypeUtil.toLong(vl)), "createdTime");
+        setupEpg(_epgMap, et-> ((LabelType)et).getExcludedPaths(),(et,vl)->((LabelType) et).setExcludedPaths(DfTypeUtil.toString(vl)), "excludedPaths");
+        setupEpg(_epgMap, et-> ((LabelType)et).getIncludedPaths(),(et,vl)->((LabelType) et).setIncludedPaths(DfTypeUtil.toString(vl)), "includedPaths");
+        setupEpg(_epgMap, et-> ((LabelType)et).getName(),(et,vl)->((LabelType) et).setName(DfTypeUtil.toString(vl)), "name");
+        setupEpg(_epgMap, et-> ((LabelType)et).getPermissions(),(et,vl)->((LabelType) et).setPermissions((String[])vl), "permissions");
+        setupEpg(_epgMap, et-> ((LabelType)et).getSortOrder(),(et,vl)->((LabelType) et).setSortOrder(DfTypeUtil.toInteger(vl)), "sortOrder");
+        setupEpg(_epgMap, et-> ((LabelType)et).getUpdatedBy(),(et,vl)->((LabelType) et).setUpdatedBy(DfTypeUtil.toString(vl)), "updatedBy");
+        setupEpg(_epgMap, et-> ((LabelType)et).getUpdatedTime(),(et,vl)->((LabelType) et).setUpdatedTime(DfTypeUtil.toLong(vl)), "updatedTime");
+        setupEpg(_epgMap, et-> ((LabelType)et).getValue(),(et,vl)->((LabelType) et).setValue(DfTypeUtil.toString(vl)), "value");
     }
 
     @Override
@@ -110,89 +103,38 @@ public class LabelTypeDbm extends AbstractDBMeta {
     protected final String _tableDbName = "label_type";
     protected final String _tableDispName = "label_type";
     protected final String _tablePropertyName = "LabelType";
-
-    public String getTableDbName() {
-        return _tableDbName;
-    }
-
+    public String getTableDbName() { return _tableDbName; }
     @Override
-    public String getTableDispName() {
-        return _tableDispName;
-    }
-
+    public String getTableDispName() { return _tableDispName; }
     @Override
-    public String getTablePropertyName() {
-        return _tablePropertyName;
-    }
-
+    public String getTablePropertyName() { return _tablePropertyName; }
     @Override
-    public TableSqlName getTableSqlName() {
-        return null;
-    }
+    public TableSqlName getTableSqlName() { return null; }
 
     // ===================================================================================
     //                                                                         Column Info
     //                                                                         ===========
-    protected final ColumnInfo _columnCreatedBy = cci("createdBy", "createdBy", null, null, String.class, "createdBy", null, false, false,
-            false, "String", 0, 0, null, false, null, null, null, null, null, false);
-    protected final ColumnInfo _columnCreatedTime = cci("createdTime", "createdTime", null, null, Long.class, "createdTime", null, false,
-            false, false, "Long", 0, 0, null, false, null, null, null, null, null, false);
-    protected final ColumnInfo _columnExcludedPaths = cci("excludedPaths", "excludedPaths", null, null, String.class, "excludedPaths",
-            null, false, false, false, "String", 0, 0, null, false, null, null, null, null, null, false);
-    protected final ColumnInfo _columnIncludedPaths = cci("includedPaths", "includedPaths", null, null, String.class, "includedPaths",
-            null, false, false, false, "String", 0, 0, null, false, null, null, null, null, null, false);
-    protected final ColumnInfo _columnName = cci("name", "name", null, null, String.class, "name", null, false, false, false, "String", 0,
-            0, null, false, null, null, null, null, null, false);
-    protected final ColumnInfo _columnPermissions = cci("permissions", "permissions", null, null, String[].class, "permissions", null,
-            false, false, false, "String", 0, 0, null, false, null, null, null, null, null, false);
-    protected final ColumnInfo _columnSortOrder = cci("sortOrder", "sortOrder", null, null, Integer.class, "sortOrder", null, false, false,
-            false, "Integer", 0, 0, null, false, null, null, null, null, null, false);
-    protected final ColumnInfo _columnUpdatedBy = cci("updatedBy", "updatedBy", null, null, String.class, "updatedBy", null, false, false,
-            false, "String", 0, 0, null, false, null, null, null, null, null, false);
-    protected final ColumnInfo _columnUpdatedTime = cci("updatedTime", "updatedTime", null, null, Long.class, "updatedTime", null, false,
-            false, false, "Long", 0, 0, null, false, null, null, null, null, null, false);
-    protected final ColumnInfo _columnValue = cci("value", "value", null, null, String.class, "value", null, false, false, false, "String",
-            0, 0, null, false, null, null, null, null, null, false);
-
-    public ColumnInfo columnCreatedBy() {
-        return _columnCreatedBy;
-    }
-
-    public ColumnInfo columnCreatedTime() {
-        return _columnCreatedTime;
-    }
-
-    public ColumnInfo columnExcludedPaths() {
-        return _columnExcludedPaths;
-    }
-
-    public ColumnInfo columnIncludedPaths() {
-        return _columnIncludedPaths;
-    }
-
-    public ColumnInfo columnName() {
-        return _columnName;
-    }
-
-    public ColumnInfo columnPermissions() {
-        return _columnPermissions;
-    }
-
-    public ColumnInfo columnSortOrder() {
-        return _columnSortOrder;
-    }
-
-    public ColumnInfo columnUpdatedBy() {
-        return _columnUpdatedBy;
-    }
-
-    public ColumnInfo columnUpdatedTime() {
-        return _columnUpdatedTime;
-    }
-
-    public ColumnInfo columnValue() {
-        return _columnValue;
-    }
+    protected final ColumnInfo _columnCreatedBy = cci("createdBy", "createdBy", null, null, String.class, "createdBy", null, false, false, false, "String", 0, 0, null, false, null, null, null, null, null, false);
+    protected final ColumnInfo _columnCreatedTime = cci("createdTime", "createdTime", null, null, Long.class, "createdTime", null, false, false, false, "Long", 0, 0, null, false, null, null, null, null, null, false);
+    protected final ColumnInfo _columnExcludedPaths = cci("excludedPaths", "excludedPaths", null, null, String.class, "excludedPaths", null, false, false, false, "String", 0, 0, null, false, null, null, null, null, null, false);
+    protected final ColumnInfo _columnIncludedPaths = cci("includedPaths", "includedPaths", null, null, String.class, "includedPaths", null, false, false, false, "String", 0, 0, null, false, null, null, null, null, null, false);
+    protected final ColumnInfo _columnName = cci("name", "name", null, null, String.class, "name", null, false, false, false, "String", 0, 0, null, false, null, null, null, null, null, false);
+    protected final ColumnInfo _columnPermissions = cci("permissions", "permissions", null, null, String[].class, "permissions", null, false, false, false, "String", 0, 0, null, false, null, null, null, null, null, false);
+    protected final ColumnInfo _columnSortOrder = cci("sortOrder", "sortOrder", null, null, Integer.class, "sortOrder", null, false, false, false, "Integer", 0, 0, null, false, null, null, null, null, null, false);
+    protected final ColumnInfo _columnUpdatedBy = cci("updatedBy", "updatedBy", null, null, String.class, "updatedBy", null, false, false, false, "String", 0, 0, null, false, null, null, null, null, null, false);
+    protected final ColumnInfo _columnUpdatedTime = cci("updatedTime", "updatedTime", null, null, Long.class, "updatedTime", null, false, false, false, "Long", 0, 0, null, false, null, null, null, null, null, false);
+    protected final ColumnInfo _columnValue = cci("value", "value", null, null, String.class, "value", null, false, false, false, "String", 0, 0, null, false, null, null, null, null, null, false);
+
+    public ColumnInfo columnCreatedBy() { return _columnCreatedBy; }
+    public ColumnInfo columnCreatedTime() { return _columnCreatedTime; }
+    public ColumnInfo columnExcludedPaths() { return _columnExcludedPaths; }
+    public ColumnInfo columnIncludedPaths() { return _columnIncludedPaths; }
+    public ColumnInfo columnName() { return _columnName; }
+    public ColumnInfo columnPermissions() { return _columnPermissions; }
+    public ColumnInfo columnSortOrder() { return _columnSortOrder; }
+    public ColumnInfo columnUpdatedBy() { return _columnUpdatedBy; }
+    public ColumnInfo columnUpdatedTime() { return _columnUpdatedTime; }
+    public ColumnInfo columnValue() { return _columnValue; }
 
     protected List<ColumnInfo> ccil() {
         List<ColumnInfo> ls = newArrayList();
@@ -282,3 +224,4 @@ public class LabelTypeDbm extends AbstractDBMeta {
         return null;
     }
 }
+

+ 32 - 80
src/main/java/org/codelibs/fess/es/config/bsentity/dbmeta/PathMappingDbm.java

@@ -15,11 +15,12 @@
  */
 package org.codelibs.fess.es.config.bsentity.dbmeta;
 
-import java.time.LocalDateTime;
+import java.time.*;
 import java.util.List;
 import java.util.Map;
 
 import org.codelibs.fess.es.config.exentity.PathMapping;
+
 import org.dbflute.Entity;
 import org.dbflute.dbmeta.AbstractDBMeta;
 import org.dbflute.dbmeta.info.ColumnInfo;
@@ -79,21 +80,14 @@ public class PathMappingDbm extends AbstractDBMeta {
     //                                       ---------------
     protected final Map<String, PropertyGateway> _epgMap = newHashMap();
     {
-        setupEpg(_epgMap, et -> ((PathMapping) et).getCreatedBy(), (et, vl) -> ((PathMapping) et).setCreatedBy(DfTypeUtil.toString(vl)),
-                "createdBy");
-        setupEpg(_epgMap, et -> ((PathMapping) et).getCreatedTime(), (et, vl) -> ((PathMapping) et).setCreatedTime(DfTypeUtil.toLong(vl)),
-                "createdTime");
-        setupEpg(_epgMap, et -> ((PathMapping) et).getProcessType(),
-                (et, vl) -> ((PathMapping) et).setProcessType(DfTypeUtil.toString(vl)), "processType");
-        setupEpg(_epgMap, et -> ((PathMapping) et).getRegex(), (et, vl) -> ((PathMapping) et).setRegex(DfTypeUtil.toString(vl)), "regex");
-        setupEpg(_epgMap, et -> ((PathMapping) et).getReplacement(),
-                (et, vl) -> ((PathMapping) et).setReplacement(DfTypeUtil.toString(vl)), "replacement");
-        setupEpg(_epgMap, et -> ((PathMapping) et).getSortOrder(), (et, vl) -> ((PathMapping) et).setSortOrder(DfTypeUtil.toInteger(vl)),
-                "sortOrder");
-        setupEpg(_epgMap, et -> ((PathMapping) et).getUpdatedBy(), (et, vl) -> ((PathMapping) et).setUpdatedBy(DfTypeUtil.toString(vl)),
-                "updatedBy");
-        setupEpg(_epgMap, et -> ((PathMapping) et).getUpdatedTime(), (et, vl) -> ((PathMapping) et).setUpdatedTime(DfTypeUtil.toLong(vl)),
-                "updatedTime");
+        setupEpg(_epgMap, et-> ((PathMapping)et).getCreatedBy(),(et,vl)->((PathMapping) et).setCreatedBy(DfTypeUtil.toString(vl)), "createdBy");
+        setupEpg(_epgMap, et-> ((PathMapping)et).getCreatedTime(),(et,vl)->((PathMapping) et).setCreatedTime(DfTypeUtil.toLong(vl)), "createdTime");
+        setupEpg(_epgMap, et-> ((PathMapping)et).getProcessType(),(et,vl)->((PathMapping) et).setProcessType(DfTypeUtil.toString(vl)), "processType");
+        setupEpg(_epgMap, et-> ((PathMapping)et).getRegex(),(et,vl)->((PathMapping) et).setRegex(DfTypeUtil.toString(vl)), "regex");
+        setupEpg(_epgMap, et-> ((PathMapping)et).getReplacement(),(et,vl)->((PathMapping) et).setReplacement(DfTypeUtil.toString(vl)), "replacement");
+        setupEpg(_epgMap, et-> ((PathMapping)et).getSortOrder(),(et,vl)->((PathMapping) et).setSortOrder(DfTypeUtil.toInteger(vl)), "sortOrder");
+        setupEpg(_epgMap, et-> ((PathMapping)et).getUpdatedBy(),(et,vl)->((PathMapping) et).setUpdatedBy(DfTypeUtil.toString(vl)), "updatedBy");
+        setupEpg(_epgMap, et-> ((PathMapping)et).getUpdatedTime(),(et,vl)->((PathMapping) et).setUpdatedTime(DfTypeUtil.toLong(vl)), "updatedTime");
     }
 
     @Override
@@ -107,77 +101,34 @@ public class PathMappingDbm extends AbstractDBMeta {
     protected final String _tableDbName = "path_mapping";
     protected final String _tableDispName = "path_mapping";
     protected final String _tablePropertyName = "PathMapping";
-
-    public String getTableDbName() {
-        return _tableDbName;
-    }
-
+    public String getTableDbName() { return _tableDbName; }
     @Override
-    public String getTableDispName() {
-        return _tableDispName;
-    }
-
+    public String getTableDispName() { return _tableDispName; }
     @Override
-    public String getTablePropertyName() {
-        return _tablePropertyName;
-    }
-
+    public String getTablePropertyName() { return _tablePropertyName; }
     @Override
-    public TableSqlName getTableSqlName() {
-        return null;
-    }
+    public TableSqlName getTableSqlName() { return null; }
 
     // ===================================================================================
     //                                                                         Column Info
     //                                                                         ===========
-    protected final ColumnInfo _columnCreatedBy = cci("createdBy", "createdBy", null, null, String.class, "createdBy", null, false, false,
-            false, "String", 0, 0, null, false, null, null, null, null, null, false);
-    protected final ColumnInfo _columnCreatedTime = cci("createdTime", "createdTime", null, null, Long.class, "createdTime", null, false,
-            false, false, "Long", 0, 0, null, false, null, null, null, null, null, false);
-    protected final ColumnInfo _columnProcessType = cci("processType", "processType", null, null, String.class, "processType", null, false,
-            false, false, "String", 0, 0, null, false, null, null, null, null, null, false);
-    protected final ColumnInfo _columnRegex = cci("regex", "regex", null, null, String.class, "regex", null, false, false, false, "String",
-            0, 0, null, false, null, null, null, null, null, false);
-    protected final ColumnInfo _columnReplacement = cci("replacement", "replacement", null, null, String.class, "replacement", null, false,
-            false, false, "String", 0, 0, null, false, null, null, null, null, null, false);
-    protected final ColumnInfo _columnSortOrder = cci("sortOrder", "sortOrder", null, null, Integer.class, "sortOrder", null, false, false,
-            false, "Integer", 0, 0, null, false, null, null, null, null, null, false);
-    protected final ColumnInfo _columnUpdatedBy = cci("updatedBy", "updatedBy", null, null, String.class, "updatedBy", null, false, false,
-            false, "String", 0, 0, null, false, null, null, null, null, null, false);
-    protected final ColumnInfo _columnUpdatedTime = cci("updatedTime", "updatedTime", null, null, Long.class, "updatedTime", null, false,
-            false, false, "Long", 0, 0, null, false, null, null, null, null, null, false);
-
-    public ColumnInfo columnCreatedBy() {
-        return _columnCreatedBy;
-    }
-
-    public ColumnInfo columnCreatedTime() {
-        return _columnCreatedTime;
-    }
-
-    public ColumnInfo columnProcessType() {
-        return _columnProcessType;
-    }
-
-    public ColumnInfo columnRegex() {
-        return _columnRegex;
-    }
-
-    public ColumnInfo columnReplacement() {
-        return _columnReplacement;
-    }
-
-    public ColumnInfo columnSortOrder() {
-        return _columnSortOrder;
-    }
-
-    public ColumnInfo columnUpdatedBy() {
-        return _columnUpdatedBy;
-    }
-
-    public ColumnInfo columnUpdatedTime() {
-        return _columnUpdatedTime;
-    }
+    protected final ColumnInfo _columnCreatedBy = cci("createdBy", "createdBy", null, null, String.class, "createdBy", null, false, false, false, "String", 0, 0, null, false, null, null, null, null, null, false);
+    protected final ColumnInfo _columnCreatedTime = cci("createdTime", "createdTime", null, null, Long.class, "createdTime", null, false, false, false, "Long", 0, 0, null, false, null, null, null, null, null, false);
+    protected final ColumnInfo _columnProcessType = cci("processType", "processType", null, null, String.class, "processType", null, false, false, false, "String", 0, 0, null, false, null, null, null, null, null, false);
+    protected final ColumnInfo _columnRegex = cci("regex", "regex", null, null, String.class, "regex", null, false, false, false, "String", 0, 0, null, false, null, null, null, null, null, false);
+    protected final ColumnInfo _columnReplacement = cci("replacement", "replacement", null, null, String.class, "replacement", null, false, false, false, "String", 0, 0, null, false, null, null, null, null, null, false);
+    protected final ColumnInfo _columnSortOrder = cci("sortOrder", "sortOrder", null, null, Integer.class, "sortOrder", null, false, false, false, "Integer", 0, 0, null, false, null, null, null, null, null, false);
+    protected final ColumnInfo _columnUpdatedBy = cci("updatedBy", "updatedBy", null, null, String.class, "updatedBy", null, false, false, false, "String", 0, 0, null, false, null, null, null, null, null, false);
+    protected final ColumnInfo _columnUpdatedTime = cci("updatedTime", "updatedTime", null, null, Long.class, "updatedTime", null, false, false, false, "Long", 0, 0, null, false, null, null, null, null, null, false);
+
+    public ColumnInfo columnCreatedBy() { return _columnCreatedBy; }
+    public ColumnInfo columnCreatedTime() { return _columnCreatedTime; }
+    public ColumnInfo columnProcessType() { return _columnProcessType; }
+    public ColumnInfo columnRegex() { return _columnRegex; }
+    public ColumnInfo columnReplacement() { return _columnReplacement; }
+    public ColumnInfo columnSortOrder() { return _columnSortOrder; }
+    public ColumnInfo columnUpdatedBy() { return _columnUpdatedBy; }
+    public ColumnInfo columnUpdatedTime() { return _columnUpdatedTime; }
 
     protected List<ColumnInfo> ccil() {
         List<ColumnInfo> ls = newArrayList();
@@ -265,3 +216,4 @@ public class PathMappingDbm extends AbstractDBMeta {
         return null;
     }
 }
+

+ 29 - 72
src/main/java/org/codelibs/fess/es/config/bsentity/dbmeta/RequestHeaderDbm.java

@@ -15,11 +15,12 @@
  */
 package org.codelibs.fess.es.config.bsentity.dbmeta;
 
-import java.time.LocalDateTime;
+import java.time.*;
 import java.util.List;
 import java.util.Map;
 
 import org.codelibs.fess.es.config.exentity.RequestHeader;
+
 import org.dbflute.Entity;
 import org.dbflute.dbmeta.AbstractDBMeta;
 import org.dbflute.dbmeta.info.ColumnInfo;
@@ -79,19 +80,13 @@ public class RequestHeaderDbm extends AbstractDBMeta {
     //                                       ---------------
     protected final Map<String, PropertyGateway> _epgMap = newHashMap();
     {
-        setupEpg(_epgMap, et -> ((RequestHeader) et).getCreatedBy(),
-                (et, vl) -> ((RequestHeader) et).setCreatedBy(DfTypeUtil.toString(vl)), "createdBy");
-        setupEpg(_epgMap, et -> ((RequestHeader) et).getCreatedTime(),
-                (et, vl) -> ((RequestHeader) et).setCreatedTime(DfTypeUtil.toLong(vl)), "createdTime");
-        setupEpg(_epgMap, et -> ((RequestHeader) et).getName(), (et, vl) -> ((RequestHeader) et).setName(DfTypeUtil.toString(vl)), "name");
-        setupEpg(_epgMap, et -> ((RequestHeader) et).getUpdatedBy(),
-                (et, vl) -> ((RequestHeader) et).setUpdatedBy(DfTypeUtil.toString(vl)), "updatedBy");
-        setupEpg(_epgMap, et -> ((RequestHeader) et).getUpdatedTime(),
-                (et, vl) -> ((RequestHeader) et).setUpdatedTime(DfTypeUtil.toLong(vl)), "updatedTime");
-        setupEpg(_epgMap, et -> ((RequestHeader) et).getValue(), (et, vl) -> ((RequestHeader) et).setValue(DfTypeUtil.toString(vl)),
-                "value");
-        setupEpg(_epgMap, et -> ((RequestHeader) et).getWebConfigId(),
-                (et, vl) -> ((RequestHeader) et).setWebConfigId(DfTypeUtil.toString(vl)), "webConfigId");
+        setupEpg(_epgMap, et-> ((RequestHeader)et).getCreatedBy(),(et,vl)->((RequestHeader) et).setCreatedBy(DfTypeUtil.toString(vl)), "createdBy");
+        setupEpg(_epgMap, et-> ((RequestHeader)et).getCreatedTime(),(et,vl)->((RequestHeader) et).setCreatedTime(DfTypeUtil.toLong(vl)), "createdTime");
+        setupEpg(_epgMap, et-> ((RequestHeader)et).getName(),(et,vl)->((RequestHeader) et).setName(DfTypeUtil.toString(vl)), "name");
+        setupEpg(_epgMap, et-> ((RequestHeader)et).getUpdatedBy(),(et,vl)->((RequestHeader) et).setUpdatedBy(DfTypeUtil.toString(vl)), "updatedBy");
+        setupEpg(_epgMap, et-> ((RequestHeader)et).getUpdatedTime(),(et,vl)->((RequestHeader) et).setUpdatedTime(DfTypeUtil.toLong(vl)), "updatedTime");
+        setupEpg(_epgMap, et-> ((RequestHeader)et).getValue(),(et,vl)->((RequestHeader) et).setValue(DfTypeUtil.toString(vl)), "value");
+        setupEpg(_epgMap, et-> ((RequestHeader)et).getWebConfigId(),(et,vl)->((RequestHeader) et).setWebConfigId(DfTypeUtil.toString(vl)), "webConfigId");
     }
 
     @Override
@@ -105,71 +100,32 @@ public class RequestHeaderDbm extends AbstractDBMeta {
     protected final String _tableDbName = "request_header";
     protected final String _tableDispName = "request_header";
     protected final String _tablePropertyName = "RequestHeader";
-
-    public String getTableDbName() {
-        return _tableDbName;
-    }
-
+    public String getTableDbName() { return _tableDbName; }
     @Override
-    public String getTableDispName() {
-        return _tableDispName;
-    }
-
+    public String getTableDispName() { return _tableDispName; }
     @Override
-    public String getTablePropertyName() {
-        return _tablePropertyName;
-    }
-
+    public String getTablePropertyName() { return _tablePropertyName; }
     @Override
-    public TableSqlName getTableSqlName() {
-        return null;
-    }
+    public TableSqlName getTableSqlName() { return null; }
 
     // ===================================================================================
     //                                                                         Column Info
     //                                                                         ===========
-    protected final ColumnInfo _columnCreatedBy = cci("createdBy", "createdBy", null, null, String.class, "createdBy", null, false, false,
-            false, "String", 0, 0, null, false, null, null, null, null, null, false);
-    protected final ColumnInfo _columnCreatedTime = cci("createdTime", "createdTime", null, null, Long.class, "createdTime", null, false,
-            false, false, "Long", 0, 0, null, false, null, null, null, null, null, false);
-    protected final ColumnInfo _columnName = cci("name", "name", null, null, String.class, "name", null, false, false, false, "String", 0,
-            0, null, false, null, null, null, null, null, false);
-    protected final ColumnInfo _columnUpdatedBy = cci("updatedBy", "updatedBy", null, null, String.class, "updatedBy", null, false, false,
-            false, "String", 0, 0, null, false, null, null, null, null, null, false);
-    protected final ColumnInfo _columnUpdatedTime = cci("updatedTime", "updatedTime", null, null, Long.class, "updatedTime", null, false,
-            false, false, "Long", 0, 0, null, false, null, null, null, null, null, false);
-    protected final ColumnInfo _columnValue = cci("value", "value", null, null, String.class, "value", null, false, false, false, "String",
-            0, 0, null, false, null, null, null, null, null, false);
-    protected final ColumnInfo _columnWebConfigId = cci("webConfigId", "webConfigId", null, null, String.class, "webConfigId", null, false,
-            false, false, "String", 0, 0, null, false, null, null, null, null, null, false);
-
-    public ColumnInfo columnCreatedBy() {
-        return _columnCreatedBy;
-    }
-
-    public ColumnInfo columnCreatedTime() {
-        return _columnCreatedTime;
-    }
-
-    public ColumnInfo columnName() {
-        return _columnName;
-    }
-
-    public ColumnInfo columnUpdatedBy() {
-        return _columnUpdatedBy;
-    }
-
-    public ColumnInfo columnUpdatedTime() {
-        return _columnUpdatedTime;
-    }
-
-    public ColumnInfo columnValue() {
-        return _columnValue;
-    }
-
-    public ColumnInfo columnWebConfigId() {
-        return _columnWebConfigId;
-    }
+    protected final ColumnInfo _columnCreatedBy = cci("createdBy", "createdBy", null, null, String.class, "createdBy", null, false, false, false, "String", 0, 0, null, false, null, null, null, null, null, false);
+    protected final ColumnInfo _columnCreatedTime = cci("createdTime", "createdTime", null, null, Long.class, "createdTime", null, false, false, false, "Long", 0, 0, null, false, null, null, null, null, null, false);
+    protected final ColumnInfo _columnName = cci("name", "name", null, null, String.class, "name", null, false, false, false, "String", 0, 0, null, false, null, null, null, null, null, false);
+    protected final ColumnInfo _columnUpdatedBy = cci("updatedBy", "updatedBy", null, null, String.class, "updatedBy", null, false, false, false, "String", 0, 0, null, false, null, null, null, null, null, false);
+    protected final ColumnInfo _columnUpdatedTime = cci("updatedTime", "updatedTime", null, null, Long.class, "updatedTime", null, false, false, false, "Long", 0, 0, null, false, null, null, null, null, null, false);
+    protected final ColumnInfo _columnValue = cci("value", "value", null, null, String.class, "value", null, false, false, false, "String", 0, 0, null, false, null, null, null, null, null, false);
+    protected final ColumnInfo _columnWebConfigId = cci("webConfigId", "webConfigId", null, null, String.class, "webConfigId", null, false, false, false, "String", 0, 0, null, false, null, null, null, null, null, false);
+
+    public ColumnInfo columnCreatedBy() { return _columnCreatedBy; }
+    public ColumnInfo columnCreatedTime() { return _columnCreatedTime; }
+    public ColumnInfo columnName() { return _columnName; }
+    public ColumnInfo columnUpdatedBy() { return _columnUpdatedBy; }
+    public ColumnInfo columnUpdatedTime() { return _columnUpdatedTime; }
+    public ColumnInfo columnValue() { return _columnValue; }
+    public ColumnInfo columnWebConfigId() { return _columnWebConfigId; }
 
     protected List<ColumnInfo> ccil() {
         List<ColumnInfo> ls = newArrayList();
@@ -256,3 +212,4 @@ public class RequestHeaderDbm extends AbstractDBMeta {
         return null;
     }
 }
+

+ 29 - 71
src/main/java/org/codelibs/fess/es/config/bsentity/dbmeta/RoleTypeDbm.java

@@ -15,11 +15,12 @@
  */
 package org.codelibs.fess.es.config.bsentity.dbmeta;
 
-import java.time.LocalDateTime;
+import java.time.*;
 import java.util.List;
 import java.util.Map;
 
 import org.codelibs.fess.es.config.exentity.RoleType;
+
 import org.dbflute.Entity;
 import org.dbflute.dbmeta.AbstractDBMeta;
 import org.dbflute.dbmeta.info.ColumnInfo;
@@ -79,18 +80,13 @@ public class RoleTypeDbm extends AbstractDBMeta {
     //                                       ---------------
     protected final Map<String, PropertyGateway> _epgMap = newHashMap();
     {
-        setupEpg(_epgMap, et -> ((RoleType) et).getCreatedBy(), (et, vl) -> ((RoleType) et).setCreatedBy(DfTypeUtil.toString(vl)),
-                "createdBy");
-        setupEpg(_epgMap, et -> ((RoleType) et).getCreatedTime(), (et, vl) -> ((RoleType) et).setCreatedTime(DfTypeUtil.toLong(vl)),
-                "createdTime");
-        setupEpg(_epgMap, et -> ((RoleType) et).getName(), (et, vl) -> ((RoleType) et).setName(DfTypeUtil.toString(vl)), "name");
-        setupEpg(_epgMap, et -> ((RoleType) et).getSortOrder(), (et, vl) -> ((RoleType) et).setSortOrder(DfTypeUtil.toInteger(vl)),
-                "sortOrder");
-        setupEpg(_epgMap, et -> ((RoleType) et).getUpdatedBy(), (et, vl) -> ((RoleType) et).setUpdatedBy(DfTypeUtil.toString(vl)),
-                "updatedBy");
-        setupEpg(_epgMap, et -> ((RoleType) et).getUpdatedTime(), (et, vl) -> ((RoleType) et).setUpdatedTime(DfTypeUtil.toLong(vl)),
-                "updatedTime");
-        setupEpg(_epgMap, et -> ((RoleType) et).getValue(), (et, vl) -> ((RoleType) et).setValue(DfTypeUtil.toString(vl)), "value");
+        setupEpg(_epgMap, et-> ((RoleType)et).getCreatedBy(),(et,vl)->((RoleType) et).setCreatedBy(DfTypeUtil.toString(vl)), "createdBy");
+        setupEpg(_epgMap, et-> ((RoleType)et).getCreatedTime(),(et,vl)->((RoleType) et).setCreatedTime(DfTypeUtil.toLong(vl)), "createdTime");
+        setupEpg(_epgMap, et-> ((RoleType)et).getName(),(et,vl)->((RoleType) et).setName(DfTypeUtil.toString(vl)), "name");
+        setupEpg(_epgMap, et-> ((RoleType)et).getSortOrder(),(et,vl)->((RoleType) et).setSortOrder(DfTypeUtil.toInteger(vl)), "sortOrder");
+        setupEpg(_epgMap, et-> ((RoleType)et).getUpdatedBy(),(et,vl)->((RoleType) et).setUpdatedBy(DfTypeUtil.toString(vl)), "updatedBy");
+        setupEpg(_epgMap, et-> ((RoleType)et).getUpdatedTime(),(et,vl)->((RoleType) et).setUpdatedTime(DfTypeUtil.toLong(vl)), "updatedTime");
+        setupEpg(_epgMap, et-> ((RoleType)et).getValue(),(et,vl)->((RoleType) et).setValue(DfTypeUtil.toString(vl)), "value");
     }
 
     @Override
@@ -104,71 +100,32 @@ public class RoleTypeDbm extends AbstractDBMeta {
     protected final String _tableDbName = "role_type";
     protected final String _tableDispName = "role_type";
     protected final String _tablePropertyName = "RoleType";
-
-    public String getTableDbName() {
-        return _tableDbName;
-    }
-
+    public String getTableDbName() { return _tableDbName; }
     @Override
-    public String getTableDispName() {
-        return _tableDispName;
-    }
-
+    public String getTableDispName() { return _tableDispName; }
     @Override
-    public String getTablePropertyName() {
-        return _tablePropertyName;
-    }
-
+    public String getTablePropertyName() { return _tablePropertyName; }
     @Override
-    public TableSqlName getTableSqlName() {
-        return null;
-    }
+    public TableSqlName getTableSqlName() { return null; }
 
     // ===================================================================================
     //                                                                         Column Info
     //                                                                         ===========
-    protected final ColumnInfo _columnCreatedBy = cci("createdBy", "createdBy", null, null, String.class, "createdBy", null, false, false,
-            false, "String", 0, 0, null, false, null, null, null, null, null, false);
-    protected final ColumnInfo _columnCreatedTime = cci("createdTime", "createdTime", null, null, Long.class, "createdTime", null, false,
-            false, false, "Long", 0, 0, null, false, null, null, null, null, null, false);
-    protected final ColumnInfo _columnName = cci("name", "name", null, null, String.class, "name", null, false, false, false, "String", 0,
-            0, null, false, null, null, null, null, null, false);
-    protected final ColumnInfo _columnSortOrder = cci("sortOrder", "sortOrder", null, null, Integer.class, "sortOrder", null, false, false,
-            false, "Integer", 0, 0, null, false, null, null, null, null, null, false);
-    protected final ColumnInfo _columnUpdatedBy = cci("updatedBy", "updatedBy", null, null, String.class, "updatedBy", null, false, false,
-            false, "String", 0, 0, null, false, null, null, null, null, null, false);
-    protected final ColumnInfo _columnUpdatedTime = cci("updatedTime", "updatedTime", null, null, Long.class, "updatedTime", null, false,
-            false, false, "Long", 0, 0, null, false, null, null, null, null, null, false);
-    protected final ColumnInfo _columnValue = cci("value", "value", null, null, String.class, "value", null, false, false, false, "String",
-            0, 0, null, false, null, null, null, null, null, false);
-
-    public ColumnInfo columnCreatedBy() {
-        return _columnCreatedBy;
-    }
-
-    public ColumnInfo columnCreatedTime() {
-        return _columnCreatedTime;
-    }
-
-    public ColumnInfo columnName() {
-        return _columnName;
-    }
-
-    public ColumnInfo columnSortOrder() {
-        return _columnSortOrder;
-    }
-
-    public ColumnInfo columnUpdatedBy() {
-        return _columnUpdatedBy;
-    }
-
-    public ColumnInfo columnUpdatedTime() {
-        return _columnUpdatedTime;
-    }
-
-    public ColumnInfo columnValue() {
-        return _columnValue;
-    }
+    protected final ColumnInfo _columnCreatedBy = cci("createdBy", "createdBy", null, null, String.class, "createdBy", null, false, false, false, "String", 0, 0, null, false, null, null, null, null, null, false);
+    protected final ColumnInfo _columnCreatedTime = cci("createdTime", "createdTime", null, null, Long.class, "createdTime", null, false, false, false, "Long", 0, 0, null, false, null, null, null, null, null, false);
+    protected final ColumnInfo _columnName = cci("name", "name", null, null, String.class, "name", null, false, false, false, "String", 0, 0, null, false, null, null, null, null, null, false);
+    protected final ColumnInfo _columnSortOrder = cci("sortOrder", "sortOrder", null, null, Integer.class, "sortOrder", null, false, false, false, "Integer", 0, 0, null, false, null, null, null, null, null, false);
+    protected final ColumnInfo _columnUpdatedBy = cci("updatedBy", "updatedBy", null, null, String.class, "updatedBy", null, false, false, false, "String", 0, 0, null, false, null, null, null, null, null, false);
+    protected final ColumnInfo _columnUpdatedTime = cci("updatedTime", "updatedTime", null, null, Long.class, "updatedTime", null, false, false, false, "Long", 0, 0, null, false, null, null, null, null, null, false);
+    protected final ColumnInfo _columnValue = cci("value", "value", null, null, String.class, "value", null, false, false, false, "String", 0, 0, null, false, null, null, null, null, null, false);
+
+    public ColumnInfo columnCreatedBy() { return _columnCreatedBy; }
+    public ColumnInfo columnCreatedTime() { return _columnCreatedTime; }
+    public ColumnInfo columnName() { return _columnName; }
+    public ColumnInfo columnSortOrder() { return _columnSortOrder; }
+    public ColumnInfo columnUpdatedBy() { return _columnUpdatedBy; }
+    public ColumnInfo columnUpdatedTime() { return _columnUpdatedTime; }
+    public ColumnInfo columnValue() { return _columnValue; }
 
     protected List<ColumnInfo> ccil() {
         List<ColumnInfo> ls = newArrayList();
@@ -255,3 +212,4 @@ public class RoleTypeDbm extends AbstractDBMeta {
         return null;
     }
 }
+

+ 47 - 120
src/main/java/org/codelibs/fess/es/config/bsentity/dbmeta/ScheduledJobDbm.java

@@ -15,11 +15,12 @@
  */
 package org.codelibs.fess.es.config.bsentity.dbmeta;
 
-import java.time.LocalDateTime;
+import java.time.*;
 import java.util.List;
 import java.util.Map;
 
 import org.codelibs.fess.es.config.exentity.ScheduledJob;
+
 import org.dbflute.Entity;
 import org.dbflute.dbmeta.AbstractDBMeta;
 import org.dbflute.dbmeta.info.ColumnInfo;
@@ -79,31 +80,19 @@ public class ScheduledJobDbm extends AbstractDBMeta {
     //                                       ---------------
     protected final Map<String, PropertyGateway> _epgMap = newHashMap();
     {
-        setupEpg(_epgMap, et -> ((ScheduledJob) et).getAvailable(), (et, vl) -> ((ScheduledJob) et).setAvailable(DfTypeUtil.toBoolean(vl)),
-                "available");
-        setupEpg(_epgMap, et -> ((ScheduledJob) et).getCrawler(), (et, vl) -> ((ScheduledJob) et).setCrawler(DfTypeUtil.toBoolean(vl)),
-                "crawler");
-        setupEpg(_epgMap, et -> ((ScheduledJob) et).getCreatedBy(), (et, vl) -> ((ScheduledJob) et).setCreatedBy(DfTypeUtil.toString(vl)),
-                "createdBy");
-        setupEpg(_epgMap, et -> ((ScheduledJob) et).getCreatedTime(),
-                (et, vl) -> ((ScheduledJob) et).setCreatedTime(DfTypeUtil.toLong(vl)), "createdTime");
-        setupEpg(_epgMap, et -> ((ScheduledJob) et).getCronExpression(),
-                (et, vl) -> ((ScheduledJob) et).setCronExpression(DfTypeUtil.toString(vl)), "cronExpression");
-        setupEpg(_epgMap, et -> ((ScheduledJob) et).getJobLogging(),
-                (et, vl) -> ((ScheduledJob) et).setJobLogging(DfTypeUtil.toBoolean(vl)), "jobLogging");
-        setupEpg(_epgMap, et -> ((ScheduledJob) et).getName(), (et, vl) -> ((ScheduledJob) et).setName(DfTypeUtil.toString(vl)), "name");
-        setupEpg(_epgMap, et -> ((ScheduledJob) et).getScriptData(),
-                (et, vl) -> ((ScheduledJob) et).setScriptData(DfTypeUtil.toString(vl)), "scriptData");
-        setupEpg(_epgMap, et -> ((ScheduledJob) et).getScriptType(),
-                (et, vl) -> ((ScheduledJob) et).setScriptType(DfTypeUtil.toString(vl)), "scriptType");
-        setupEpg(_epgMap, et -> ((ScheduledJob) et).getSortOrder(), (et, vl) -> ((ScheduledJob) et).setSortOrder(DfTypeUtil.toInteger(vl)),
-                "sortOrder");
-        setupEpg(_epgMap, et -> ((ScheduledJob) et).getTarget(), (et, vl) -> ((ScheduledJob) et).setTarget(DfTypeUtil.toString(vl)),
-                "target");
-        setupEpg(_epgMap, et -> ((ScheduledJob) et).getUpdatedBy(), (et, vl) -> ((ScheduledJob) et).setUpdatedBy(DfTypeUtil.toString(vl)),
-                "updatedBy");
-        setupEpg(_epgMap, et -> ((ScheduledJob) et).getUpdatedTime(),
-                (et, vl) -> ((ScheduledJob) et).setUpdatedTime(DfTypeUtil.toLong(vl)), "updatedTime");
+        setupEpg(_epgMap, et-> ((ScheduledJob)et).getAvailable(),(et,vl)->((ScheduledJob) et).setAvailable(DfTypeUtil.toBoolean(vl)), "available");
+        setupEpg(_epgMap, et-> ((ScheduledJob)et).getCrawler(),(et,vl)->((ScheduledJob) et).setCrawler(DfTypeUtil.toBoolean(vl)), "crawler");
+        setupEpg(_epgMap, et-> ((ScheduledJob)et).getCreatedBy(),(et,vl)->((ScheduledJob) et).setCreatedBy(DfTypeUtil.toString(vl)), "createdBy");
+        setupEpg(_epgMap, et-> ((ScheduledJob)et).getCreatedTime(),(et,vl)->((ScheduledJob) et).setCreatedTime(DfTypeUtil.toLong(vl)), "createdTime");
+        setupEpg(_epgMap, et-> ((ScheduledJob)et).getCronExpression(),(et,vl)->((ScheduledJob) et).setCronExpression(DfTypeUtil.toString(vl)), "cronExpression");
+        setupEpg(_epgMap, et-> ((ScheduledJob)et).getJobLogging(),(et,vl)->((ScheduledJob) et).setJobLogging(DfTypeUtil.toBoolean(vl)), "jobLogging");
+        setupEpg(_epgMap, et-> ((ScheduledJob)et).getName(),(et,vl)->((ScheduledJob) et).setName(DfTypeUtil.toString(vl)), "name");
+        setupEpg(_epgMap, et-> ((ScheduledJob)et).getScriptData(),(et,vl)->((ScheduledJob) et).setScriptData(DfTypeUtil.toString(vl)), "scriptData");
+        setupEpg(_epgMap, et-> ((ScheduledJob)et).getScriptType(),(et,vl)->((ScheduledJob) et).setScriptType(DfTypeUtil.toString(vl)), "scriptType");
+        setupEpg(_epgMap, et-> ((ScheduledJob)et).getSortOrder(),(et,vl)->((ScheduledJob) et).setSortOrder(DfTypeUtil.toInteger(vl)), "sortOrder");
+        setupEpg(_epgMap, et-> ((ScheduledJob)et).getTarget(),(et,vl)->((ScheduledJob) et).setTarget(DfTypeUtil.toString(vl)), "target");
+        setupEpg(_epgMap, et-> ((ScheduledJob)et).getUpdatedBy(),(et,vl)->((ScheduledJob) et).setUpdatedBy(DfTypeUtil.toString(vl)), "updatedBy");
+        setupEpg(_epgMap, et-> ((ScheduledJob)et).getUpdatedTime(),(et,vl)->((ScheduledJob) et).setUpdatedTime(DfTypeUtil.toLong(vl)), "updatedTime");
     }
 
     @Override
@@ -117,107 +106,44 @@ public class ScheduledJobDbm extends AbstractDBMeta {
     protected final String _tableDbName = "scheduled_job";
     protected final String _tableDispName = "scheduled_job";
     protected final String _tablePropertyName = "ScheduledJob";
-
-    public String getTableDbName() {
-        return _tableDbName;
-    }
-
+    public String getTableDbName() { return _tableDbName; }
     @Override
-    public String getTableDispName() {
-        return _tableDispName;
-    }
-
+    public String getTableDispName() { return _tableDispName; }
     @Override
-    public String getTablePropertyName() {
-        return _tablePropertyName;
-    }
-
+    public String getTablePropertyName() { return _tablePropertyName; }
     @Override
-    public TableSqlName getTableSqlName() {
-        return null;
-    }
+    public TableSqlName getTableSqlName() { return null; }
 
     // ===================================================================================
     //                                                                         Column Info
     //                                                                         ===========
-    protected final ColumnInfo _columnAvailable = cci("available", "available", null, null, Boolean.class, "available", null, false, false,
-            false, "Boolean", 0, 0, null, false, null, null, null, null, null, false);
-    protected final ColumnInfo _columnCrawler = cci("crawler", "crawler", null, null, Boolean.class, "crawler", null, false, false, false,
-            "Boolean", 0, 0, null, false, null, null, null, null, null, false);
-    protected final ColumnInfo _columnCreatedBy = cci("createdBy", "createdBy", null, null, String.class, "createdBy", null, false, false,
-            false, "String", 0, 0, null, false, null, null, null, null, null, false);
-    protected final ColumnInfo _columnCreatedTime = cci("createdTime", "createdTime", null, null, Long.class, "createdTime", null, false,
-            false, false, "Long", 0, 0, null, false, null, null, null, null, null, false);
-    protected final ColumnInfo _columnCronExpression = cci("cronExpression", "cronExpression", null, null, String.class, "cronExpression",
-            null, false, false, false, "String", 0, 0, null, false, null, null, null, null, null, false);
-    protected final ColumnInfo _columnJobLogging = cci("jobLogging", "jobLogging", null, null, Boolean.class, "jobLogging", null, false,
-            false, false, "Boolean", 0, 0, null, false, null, null, null, null, null, false);
-    protected final ColumnInfo _columnName = cci("name", "name", null, null, String.class, "name", null, false, false, false, "String", 0,
-            0, null, false, null, null, null, null, null, false);
-    protected final ColumnInfo _columnScriptData = cci("scriptData", "scriptData", null, null, String.class, "scriptData", null, false,
-            false, false, "String", 0, 0, null, false, null, null, null, null, null, false);
-    protected final ColumnInfo _columnScriptType = cci("scriptType", "scriptType", null, null, String.class, "scriptType", null, false,
-            false, false, "String", 0, 0, null, false, null, null, null, null, null, false);
-    protected final ColumnInfo _columnSortOrder = cci("sortOrder", "sortOrder", null, null, Integer.class, "sortOrder", null, false, false,
-            false, "Integer", 0, 0, null, false, null, null, null, null, null, false);
-    protected final ColumnInfo _columnTarget = cci("target", "target", null, null, String.class, "target", null, false, false, false,
-            "String", 0, 0, null, false, null, null, null, null, null, false);
-    protected final ColumnInfo _columnUpdatedBy = cci("updatedBy", "updatedBy", null, null, String.class, "updatedBy", null, false, false,
-            false, "String", 0, 0, null, false, null, null, null, null, null, false);
-    protected final ColumnInfo _columnUpdatedTime = cci("updatedTime", "updatedTime", null, null, Long.class, "updatedTime", null, false,
-            false, false, "Long", 0, 0, null, false, null, null, null, null, null, false);
-
-    public ColumnInfo columnAvailable() {
-        return _columnAvailable;
-    }
-
-    public ColumnInfo columnCrawler() {
-        return _columnCrawler;
-    }
-
-    public ColumnInfo columnCreatedBy() {
-        return _columnCreatedBy;
-    }
-
-    public ColumnInfo columnCreatedTime() {
-        return _columnCreatedTime;
-    }
-
-    public ColumnInfo columnCronExpression() {
-        return _columnCronExpression;
-    }
-
-    public ColumnInfo columnJobLogging() {
-        return _columnJobLogging;
-    }
-
-    public ColumnInfo columnName() {
-        return _columnName;
-    }
-
-    public ColumnInfo columnScriptData() {
-        return _columnScriptData;
-    }
-
-    public ColumnInfo columnScriptType() {
-        return _columnScriptType;
-    }
-
-    public ColumnInfo columnSortOrder() {
-        return _columnSortOrder;
-    }
-
-    public ColumnInfo columnTarget() {
-        return _columnTarget;
-    }
-
-    public ColumnInfo columnUpdatedBy() {
-        return _columnUpdatedBy;
-    }
-
-    public ColumnInfo columnUpdatedTime() {
-        return _columnUpdatedTime;
-    }
+    protected final ColumnInfo _columnAvailable = cci("available", "available", null, null, Boolean.class, "available", null, false, false, false, "Boolean", 0, 0, null, false, null, null, null, null, null, false);
+    protected final ColumnInfo _columnCrawler = cci("crawler", "crawler", null, null, Boolean.class, "crawler", null, false, false, false, "Boolean", 0, 0, null, false, null, null, null, null, null, false);
+    protected final ColumnInfo _columnCreatedBy = cci("createdBy", "createdBy", null, null, String.class, "createdBy", null, false, false, false, "String", 0, 0, null, false, null, null, null, null, null, false);
+    protected final ColumnInfo _columnCreatedTime = cci("createdTime", "createdTime", null, null, Long.class, "createdTime", null, false, false, false, "Long", 0, 0, null, false, null, null, null, null, null, false);
+    protected final ColumnInfo _columnCronExpression = cci("cronExpression", "cronExpression", null, null, String.class, "cronExpression", null, false, false, false, "String", 0, 0, null, false, null, null, null, null, null, false);
+    protected final ColumnInfo _columnJobLogging = cci("jobLogging", "jobLogging", null, null, Boolean.class, "jobLogging", null, false, false, false, "Boolean", 0, 0, null, false, null, null, null, null, null, false);
+    protected final ColumnInfo _columnName = cci("name", "name", null, null, String.class, "name", null, false, false, false, "String", 0, 0, null, false, null, null, null, null, null, false);
+    protected final ColumnInfo _columnScriptData = cci("scriptData", "scriptData", null, null, String.class, "scriptData", null, false, false, false, "String", 0, 0, null, false, null, null, null, null, null, false);
+    protected final ColumnInfo _columnScriptType = cci("scriptType", "scriptType", null, null, String.class, "scriptType", null, false, false, false, "String", 0, 0, null, false, null, null, null, null, null, false);
+    protected final ColumnInfo _columnSortOrder = cci("sortOrder", "sortOrder", null, null, Integer.class, "sortOrder", null, false, false, false, "Integer", 0, 0, null, false, null, null, null, null, null, false);
+    protected final ColumnInfo _columnTarget = cci("target", "target", null, null, String.class, "target", null, false, false, false, "String", 0, 0, null, false, null, null, null, null, null, false);
+    protected final ColumnInfo _columnUpdatedBy = cci("updatedBy", "updatedBy", null, null, String.class, "updatedBy", null, false, false, false, "String", 0, 0, null, false, null, null, null, null, null, false);
+    protected final ColumnInfo _columnUpdatedTime = cci("updatedTime", "updatedTime", null, null, Long.class, "updatedTime", null, false, false, false, "Long", 0, 0, null, false, null, null, null, null, null, false);
+
+    public ColumnInfo columnAvailable() { return _columnAvailable; }
+    public ColumnInfo columnCrawler() { return _columnCrawler; }
+    public ColumnInfo columnCreatedBy() { return _columnCreatedBy; }
+    public ColumnInfo columnCreatedTime() { return _columnCreatedTime; }
+    public ColumnInfo columnCronExpression() { return _columnCronExpression; }
+    public ColumnInfo columnJobLogging() { return _columnJobLogging; }
+    public ColumnInfo columnName() { return _columnName; }
+    public ColumnInfo columnScriptData() { return _columnScriptData; }
+    public ColumnInfo columnScriptType() { return _columnScriptType; }
+    public ColumnInfo columnSortOrder() { return _columnSortOrder; }
+    public ColumnInfo columnTarget() { return _columnTarget; }
+    public ColumnInfo columnUpdatedBy() { return _columnUpdatedBy; }
+    public ColumnInfo columnUpdatedTime() { return _columnUpdatedTime; }
 
     protected List<ColumnInfo> ccil() {
         List<ColumnInfo> ls = newArrayList();
@@ -310,3 +236,4 @@ public class ScheduledJobDbm extends AbstractDBMeta {
         return null;
     }
 }
+

+ 44 - 113
src/main/java/org/codelibs/fess/es/config/bsentity/dbmeta/WebAuthenticationDbm.java

@@ -15,11 +15,12 @@
  */
 package org.codelibs.fess.es.config.bsentity.dbmeta;
 
-import java.time.LocalDateTime;
+import java.time.*;
 import java.util.List;
 import java.util.Map;
 
 import org.codelibs.fess.es.config.exentity.WebAuthentication;
+
 import org.dbflute.Entity;
 import org.dbflute.dbmeta.AbstractDBMeta;
 import org.dbflute.dbmeta.info.ColumnInfo;
@@ -79,30 +80,18 @@ public class WebAuthenticationDbm extends AbstractDBMeta {
     //                                       ---------------
     protected final Map<String, PropertyGateway> _epgMap = newHashMap();
     {
-        setupEpg(_epgMap, et -> ((WebAuthentication) et).getAuthRealm(),
-                (et, vl) -> ((WebAuthentication) et).setAuthRealm(DfTypeUtil.toString(vl)), "authRealm");
-        setupEpg(_epgMap, et -> ((WebAuthentication) et).getCreatedBy(),
-                (et, vl) -> ((WebAuthentication) et).setCreatedBy(DfTypeUtil.toString(vl)), "createdBy");
-        setupEpg(_epgMap, et -> ((WebAuthentication) et).getCreatedTime(),
-                (et, vl) -> ((WebAuthentication) et).setCreatedTime(DfTypeUtil.toLong(vl)), "createdTime");
-        setupEpg(_epgMap, et -> ((WebAuthentication) et).getHostname(),
-                (et, vl) -> ((WebAuthentication) et).setHostname(DfTypeUtil.toString(vl)), "hostname");
-        setupEpg(_epgMap, et -> ((WebAuthentication) et).getParameters(),
-                (et, vl) -> ((WebAuthentication) et).setParameters(DfTypeUtil.toString(vl)), "parameters");
-        setupEpg(_epgMap, et -> ((WebAuthentication) et).getPassword(),
-                (et, vl) -> ((WebAuthentication) et).setPassword(DfTypeUtil.toString(vl)), "password");
-        setupEpg(_epgMap, et -> ((WebAuthentication) et).getPort(), (et, vl) -> ((WebAuthentication) et).setPort(DfTypeUtil.toInteger(vl)),
-                "port");
-        setupEpg(_epgMap, et -> ((WebAuthentication) et).getProtocolScheme(),
-                (et, vl) -> ((WebAuthentication) et).setProtocolScheme(DfTypeUtil.toString(vl)), "protocolScheme");
-        setupEpg(_epgMap, et -> ((WebAuthentication) et).getUpdatedBy(),
-                (et, vl) -> ((WebAuthentication) et).setUpdatedBy(DfTypeUtil.toString(vl)), "updatedBy");
-        setupEpg(_epgMap, et -> ((WebAuthentication) et).getUpdatedTime(),
-                (et, vl) -> ((WebAuthentication) et).setUpdatedTime(DfTypeUtil.toLong(vl)), "updatedTime");
-        setupEpg(_epgMap, et -> ((WebAuthentication) et).getUsername(),
-                (et, vl) -> ((WebAuthentication) et).setUsername(DfTypeUtil.toString(vl)), "username");
-        setupEpg(_epgMap, et -> ((WebAuthentication) et).getWebConfigId(),
-                (et, vl) -> ((WebAuthentication) et).setWebConfigId(DfTypeUtil.toString(vl)), "webConfigId");
+        setupEpg(_epgMap, et-> ((WebAuthentication)et).getAuthRealm(),(et,vl)->((WebAuthentication) et).setAuthRealm(DfTypeUtil.toString(vl)), "authRealm");
+        setupEpg(_epgMap, et-> ((WebAuthentication)et).getCreatedBy(),(et,vl)->((WebAuthentication) et).setCreatedBy(DfTypeUtil.toString(vl)), "createdBy");
+        setupEpg(_epgMap, et-> ((WebAuthentication)et).getCreatedTime(),(et,vl)->((WebAuthentication) et).setCreatedTime(DfTypeUtil.toLong(vl)), "createdTime");
+        setupEpg(_epgMap, et-> ((WebAuthentication)et).getHostname(),(et,vl)->((WebAuthentication) et).setHostname(DfTypeUtil.toString(vl)), "hostname");
+        setupEpg(_epgMap, et-> ((WebAuthentication)et).getParameters(),(et,vl)->((WebAuthentication) et).setParameters(DfTypeUtil.toString(vl)), "parameters");
+        setupEpg(_epgMap, et-> ((WebAuthentication)et).getPassword(),(et,vl)->((WebAuthentication) et).setPassword(DfTypeUtil.toString(vl)), "password");
+        setupEpg(_epgMap, et-> ((WebAuthentication)et).getPort(),(et,vl)->((WebAuthentication) et).setPort(DfTypeUtil.toInteger(vl)), "port");
+        setupEpg(_epgMap, et-> ((WebAuthentication)et).getProtocolScheme(),(et,vl)->((WebAuthentication) et).setProtocolScheme(DfTypeUtil.toString(vl)), "protocolScheme");
+        setupEpg(_epgMap, et-> ((WebAuthentication)et).getUpdatedBy(),(et,vl)->((WebAuthentication) et).setUpdatedBy(DfTypeUtil.toString(vl)), "updatedBy");
+        setupEpg(_epgMap, et-> ((WebAuthentication)et).getUpdatedTime(),(et,vl)->((WebAuthentication) et).setUpdatedTime(DfTypeUtil.toLong(vl)), "updatedTime");
+        setupEpg(_epgMap, et-> ((WebAuthentication)et).getUsername(),(et,vl)->((WebAuthentication) et).setUsername(DfTypeUtil.toString(vl)), "username");
+        setupEpg(_epgMap, et-> ((WebAuthentication)et).getWebConfigId(),(et,vl)->((WebAuthentication) et).setWebConfigId(DfTypeUtil.toString(vl)), "webConfigId");
     }
 
     @Override
@@ -116,101 +105,42 @@ public class WebAuthenticationDbm extends AbstractDBMeta {
     protected final String _tableDbName = "web_authentication";
     protected final String _tableDispName = "web_authentication";
     protected final String _tablePropertyName = "WebAuthentication";
-
-    public String getTableDbName() {
-        return _tableDbName;
-    }
-
+    public String getTableDbName() { return _tableDbName; }
     @Override
-    public String getTableDispName() {
-        return _tableDispName;
-    }
-
+    public String getTableDispName() { return _tableDispName; }
     @Override
-    public String getTablePropertyName() {
-        return _tablePropertyName;
-    }
-
+    public String getTablePropertyName() { return _tablePropertyName; }
     @Override
-    public TableSqlName getTableSqlName() {
-        return null;
-    }
+    public TableSqlName getTableSqlName() { return null; }
 
     // ===================================================================================
     //                                                                         Column Info
     //                                                                         ===========
-    protected final ColumnInfo _columnAuthRealm = cci("authRealm", "authRealm", null, null, String.class, "authRealm", null, false, false,
-            false, "String", 0, 0, null, false, null, null, null, null, null, false);
-    protected final ColumnInfo _columnCreatedBy = cci("createdBy", "createdBy", null, null, String.class, "createdBy", null, false, false,
-            false, "String", 0, 0, null, false, null, null, null, null, null, false);
-    protected final ColumnInfo _columnCreatedTime = cci("createdTime", "createdTime", null, null, Long.class, "createdTime", null, false,
-            false, false, "Long", 0, 0, null, false, null, null, null, null, null, false);
-    protected final ColumnInfo _columnHostname = cci("hostname", "hostname", null, null, String.class, "hostname", null, false, false,
-            false, "String", 0, 0, null, false, null, null, null, null, null, false);
-    protected final ColumnInfo _columnParameters = cci("parameters", "parameters", null, null, String.class, "parameters", null, false,
-            false, false, "String", 0, 0, null, false, null, null, null, null, null, false);
-    protected final ColumnInfo _columnPassword = cci("password", "password", null, null, String.class, "password", null, false, false,
-            false, "String", 0, 0, null, false, null, null, null, null, null, false);
-    protected final ColumnInfo _columnPort = cci("port", "port", null, null, Integer.class, "port", null, false, false, false, "Integer",
-            0, 0, null, false, null, null, null, null, null, false);
-    protected final ColumnInfo _columnProtocolScheme = cci("protocolScheme", "protocolScheme", null, null, String.class, "protocolScheme",
-            null, false, false, false, "String", 0, 0, null, false, null, null, null, null, null, false);
-    protected final ColumnInfo _columnUpdatedBy = cci("updatedBy", "updatedBy", null, null, String.class, "updatedBy", null, false, false,
-            false, "String", 0, 0, null, false, null, null, null, null, null, false);
-    protected final ColumnInfo _columnUpdatedTime = cci("updatedTime", "updatedTime", null, null, Long.class, "updatedTime", null, false,
-            false, false, "Long", 0, 0, null, false, null, null, null, null, null, false);
-    protected final ColumnInfo _columnUsername = cci("username", "username", null, null, String.class, "username", null, false, false,
-            false, "String", 0, 0, null, false, null, null, null, null, null, false);
-    protected final ColumnInfo _columnWebConfigId = cci("webConfigId", "webConfigId", null, null, String.class, "webConfigId", null, false,
-            false, false, "String", 0, 0, null, false, null, null, null, null, null, false);
-
-    public ColumnInfo columnAuthRealm() {
-        return _columnAuthRealm;
-    }
-
-    public ColumnInfo columnCreatedBy() {
-        return _columnCreatedBy;
-    }
-
-    public ColumnInfo columnCreatedTime() {
-        return _columnCreatedTime;
-    }
-
-    public ColumnInfo columnHostname() {
-        return _columnHostname;
-    }
-
-    public ColumnInfo columnParameters() {
-        return _columnParameters;
-    }
-
-    public ColumnInfo columnPassword() {
-        return _columnPassword;
-    }
-
-    public ColumnInfo columnPort() {
-        return _columnPort;
-    }
-
-    public ColumnInfo columnProtocolScheme() {
-        return _columnProtocolScheme;
-    }
-
-    public ColumnInfo columnUpdatedBy() {
-        return _columnUpdatedBy;
-    }
-
-    public ColumnInfo columnUpdatedTime() {
-        return _columnUpdatedTime;
-    }
-
-    public ColumnInfo columnUsername() {
-        return _columnUsername;
-    }
-
-    public ColumnInfo columnWebConfigId() {
-        return _columnWebConfigId;
-    }
+    protected final ColumnInfo _columnAuthRealm = cci("authRealm", "authRealm", null, null, String.class, "authRealm", null, false, false, false, "String", 0, 0, null, false, null, null, null, null, null, false);
+    protected final ColumnInfo _columnCreatedBy = cci("createdBy", "createdBy", null, null, String.class, "createdBy", null, false, false, false, "String", 0, 0, null, false, null, null, null, null, null, false);
+    protected final ColumnInfo _columnCreatedTime = cci("createdTime", "createdTime", null, null, Long.class, "createdTime", null, false, false, false, "Long", 0, 0, null, false, null, null, null, null, null, false);
+    protected final ColumnInfo _columnHostname = cci("hostname", "hostname", null, null, String.class, "hostname", null, false, false, false, "String", 0, 0, null, false, null, null, null, null, null, false);
+    protected final ColumnInfo _columnParameters = cci("parameters", "parameters", null, null, String.class, "parameters", null, false, false, false, "String", 0, 0, null, false, null, null, null, null, null, false);
+    protected final ColumnInfo _columnPassword = cci("password", "password", null, null, String.class, "password", null, false, false, false, "String", 0, 0, null, false, null, null, null, null, null, false);
+    protected final ColumnInfo _columnPort = cci("port", "port", null, null, Integer.class, "port", null, false, false, false, "Integer", 0, 0, null, false, null, null, null, null, null, false);
+    protected final ColumnInfo _columnProtocolScheme = cci("protocolScheme", "protocolScheme", null, null, String.class, "protocolScheme", null, false, false, false, "String", 0, 0, null, false, null, null, null, null, null, false);
+    protected final ColumnInfo _columnUpdatedBy = cci("updatedBy", "updatedBy", null, null, String.class, "updatedBy", null, false, false, false, "String", 0, 0, null, false, null, null, null, null, null, false);
+    protected final ColumnInfo _columnUpdatedTime = cci("updatedTime", "updatedTime", null, null, Long.class, "updatedTime", null, false, false, false, "Long", 0, 0, null, false, null, null, null, null, null, false);
+    protected final ColumnInfo _columnUsername = cci("username", "username", null, null, String.class, "username", null, false, false, false, "String", 0, 0, null, false, null, null, null, null, null, false);
+    protected final ColumnInfo _columnWebConfigId = cci("webConfigId", "webConfigId", null, null, String.class, "webConfigId", null, false, false, false, "String", 0, 0, null, false, null, null, null, null, null, false);
+
+    public ColumnInfo columnAuthRealm() { return _columnAuthRealm; }
+    public ColumnInfo columnCreatedBy() { return _columnCreatedBy; }
+    public ColumnInfo columnCreatedTime() { return _columnCreatedTime; }
+    public ColumnInfo columnHostname() { return _columnHostname; }
+    public ColumnInfo columnParameters() { return _columnParameters; }
+    public ColumnInfo columnPassword() { return _columnPassword; }
+    public ColumnInfo columnPort() { return _columnPort; }
+    public ColumnInfo columnProtocolScheme() { return _columnProtocolScheme; }
+    public ColumnInfo columnUpdatedBy() { return _columnUpdatedBy; }
+    public ColumnInfo columnUpdatedTime() { return _columnUpdatedTime; }
+    public ColumnInfo columnUsername() { return _columnUsername; }
+    public ColumnInfo columnWebConfigId() { return _columnWebConfigId; }
 
     protected List<ColumnInfo> ccil() {
         List<ColumnInfo> ls = newArrayList();
@@ -302,3 +232,4 @@ public class WebAuthenticationDbm extends AbstractDBMeta {
         return null;
     }
 }
+

+ 71 - 181
src/main/java/org/codelibs/fess/es/config/bsentity/dbmeta/WebConfigDbm.java

@@ -15,11 +15,12 @@
  */
 package org.codelibs.fess.es.config.bsentity.dbmeta;
 
-import java.time.LocalDateTime;
+import java.time.*;
 import java.util.List;
 import java.util.Map;
 
 import org.codelibs.fess.es.config.exentity.WebConfig;
+
 import org.dbflute.Entity;
 import org.dbflute.dbmeta.AbstractDBMeta;
 import org.dbflute.dbmeta.info.ColumnInfo;
@@ -79,44 +80,27 @@ public class WebConfigDbm extends AbstractDBMeta {
     //                                       ---------------
     protected final Map<String, PropertyGateway> _epgMap = newHashMap();
     {
-        setupEpg(_epgMap, et -> ((WebConfig) et).getAvailable(), (et, vl) -> ((WebConfig) et).setAvailable(DfTypeUtil.toBoolean(vl)),
-                "available");
-        setupEpg(_epgMap, et -> ((WebConfig) et).getBoost(), (et, vl) -> ((WebConfig) et).setBoost(DfTypeUtil.toFloat(vl)), "boost");
-        setupEpg(_epgMap, et -> ((WebConfig) et).getConfigParameter(),
-                (et, vl) -> ((WebConfig) et).setConfigParameter(DfTypeUtil.toString(vl)), "configParameter");
-        setupEpg(_epgMap, et -> ((WebConfig) et).getCreatedBy(), (et, vl) -> ((WebConfig) et).setCreatedBy(DfTypeUtil.toString(vl)),
-                "createdBy");
-        setupEpg(_epgMap, et -> ((WebConfig) et).getCreatedTime(), (et, vl) -> ((WebConfig) et).setCreatedTime(DfTypeUtil.toLong(vl)),
-                "createdTime");
-        setupEpg(_epgMap, et -> ((WebConfig) et).getDepth(), (et, vl) -> ((WebConfig) et).setDepth(DfTypeUtil.toInteger(vl)), "depth");
-        setupEpg(_epgMap, et -> ((WebConfig) et).getExcludedDocUrls(),
-                (et, vl) -> ((WebConfig) et).setExcludedDocUrls(DfTypeUtil.toString(vl)), "excludedDocUrls");
-        setupEpg(_epgMap, et -> ((WebConfig) et).getExcludedUrls(), (et, vl) -> ((WebConfig) et).setExcludedUrls(DfTypeUtil.toString(vl)),
-                "excludedUrls");
-        setupEpg(_epgMap, et -> ((WebConfig) et).getIncludedDocUrls(),
-                (et, vl) -> ((WebConfig) et).setIncludedDocUrls(DfTypeUtil.toString(vl)), "includedDocUrls");
-        setupEpg(_epgMap, et -> ((WebConfig) et).getIncludedUrls(), (et, vl) -> ((WebConfig) et).setIncludedUrls(DfTypeUtil.toString(vl)),
-                "includedUrls");
-        setupEpg(_epgMap, et -> ((WebConfig) et).getIntervalTime(), (et, vl) -> ((WebConfig) et).setIntervalTime(DfTypeUtil.toInteger(vl)),
-                "intervalTime");
-        setupEpg(_epgMap, et -> ((WebConfig) et).getTimeToLive(), (et, vl) -> ((WebConfig) et).setTimeToLive(DfTypeUtil.toInteger(vl)),
-                "timeToLive");
-        setupEpg(_epgMap, et -> ((WebConfig) et).getMaxAccessCount(),
-                (et, vl) -> ((WebConfig) et).setMaxAccessCount(DfTypeUtil.toLong(vl)), "maxAccessCount");
-        setupEpg(_epgMap, et -> ((WebConfig) et).getName(), (et, vl) -> ((WebConfig) et).setName(DfTypeUtil.toString(vl)), "name");
-        setupEpg(_epgMap, et -> ((WebConfig) et).getNumOfThread(), (et, vl) -> ((WebConfig) et).setNumOfThread(DfTypeUtil.toInteger(vl)),
-                "numOfThread");
-        setupEpg(_epgMap, et -> ((WebConfig) et).getPermissions(), (et, vl) -> ((WebConfig) et).setPermissions((String[]) vl),
-                "permissions");
-        setupEpg(_epgMap, et -> ((WebConfig) et).getSortOrder(), (et, vl) -> ((WebConfig) et).setSortOrder(DfTypeUtil.toInteger(vl)),
-                "sortOrder");
-        setupEpg(_epgMap, et -> ((WebConfig) et).getUpdatedBy(), (et, vl) -> ((WebConfig) et).setUpdatedBy(DfTypeUtil.toString(vl)),
-                "updatedBy");
-        setupEpg(_epgMap, et -> ((WebConfig) et).getUpdatedTime(), (et, vl) -> ((WebConfig) et).setUpdatedTime(DfTypeUtil.toLong(vl)),
-                "updatedTime");
-        setupEpg(_epgMap, et -> ((WebConfig) et).getUrls(), (et, vl) -> ((WebConfig) et).setUrls(DfTypeUtil.toString(vl)), "urls");
-        setupEpg(_epgMap, et -> ((WebConfig) et).getUserAgent(), (et, vl) -> ((WebConfig) et).setUserAgent(DfTypeUtil.toString(vl)),
-                "userAgent");
+        setupEpg(_epgMap, et-> ((WebConfig)et).getAvailable(),(et,vl)->((WebConfig) et).setAvailable(DfTypeUtil.toBoolean(vl)), "available");
+        setupEpg(_epgMap, et-> ((WebConfig)et).getBoost(),(et,vl)->((WebConfig) et).setBoost(DfTypeUtil.toFloat(vl)), "boost");
+        setupEpg(_epgMap, et-> ((WebConfig)et).getConfigParameter(),(et,vl)->((WebConfig) et).setConfigParameter(DfTypeUtil.toString(vl)), "configParameter");
+        setupEpg(_epgMap, et-> ((WebConfig)et).getCreatedBy(),(et,vl)->((WebConfig) et).setCreatedBy(DfTypeUtil.toString(vl)), "createdBy");
+        setupEpg(_epgMap, et-> ((WebConfig)et).getCreatedTime(),(et,vl)->((WebConfig) et).setCreatedTime(DfTypeUtil.toLong(vl)), "createdTime");
+        setupEpg(_epgMap, et-> ((WebConfig)et).getDepth(),(et,vl)->((WebConfig) et).setDepth(DfTypeUtil.toInteger(vl)), "depth");
+        setupEpg(_epgMap, et-> ((WebConfig)et).getExcludedDocUrls(),(et,vl)->((WebConfig) et).setExcludedDocUrls(DfTypeUtil.toString(vl)), "excludedDocUrls");
+        setupEpg(_epgMap, et-> ((WebConfig)et).getExcludedUrls(),(et,vl)->((WebConfig) et).setExcludedUrls(DfTypeUtil.toString(vl)), "excludedUrls");
+        setupEpg(_epgMap, et-> ((WebConfig)et).getIncludedDocUrls(),(et,vl)->((WebConfig) et).setIncludedDocUrls(DfTypeUtil.toString(vl)), "includedDocUrls");
+        setupEpg(_epgMap, et-> ((WebConfig)et).getIncludedUrls(),(et,vl)->((WebConfig) et).setIncludedUrls(DfTypeUtil.toString(vl)), "includedUrls");
+        setupEpg(_epgMap, et-> ((WebConfig)et).getIntervalTime(),(et,vl)->((WebConfig) et).setIntervalTime(DfTypeUtil.toInteger(vl)), "intervalTime");
+        setupEpg(_epgMap, et-> ((WebConfig)et).getTimeToLive(),(et,vl)->((WebConfig) et).setTimeToLive(DfTypeUtil.toInteger(vl)), "timeToLive");
+        setupEpg(_epgMap, et-> ((WebConfig)et).getMaxAccessCount(),(et,vl)->((WebConfig) et).setMaxAccessCount(DfTypeUtil.toLong(vl)), "maxAccessCount");
+        setupEpg(_epgMap, et-> ((WebConfig)et).getName(),(et,vl)->((WebConfig) et).setName(DfTypeUtil.toString(vl)), "name");
+        setupEpg(_epgMap, et-> ((WebConfig)et).getNumOfThread(),(et,vl)->((WebConfig) et).setNumOfThread(DfTypeUtil.toInteger(vl)), "numOfThread");
+        setupEpg(_epgMap, et-> ((WebConfig)et).getPermissions(),(et,vl)->((WebConfig) et).setPermissions((String[])vl), "permissions");
+        setupEpg(_epgMap, et-> ((WebConfig)et).getSortOrder(),(et,vl)->((WebConfig) et).setSortOrder(DfTypeUtil.toInteger(vl)), "sortOrder");
+        setupEpg(_epgMap, et-> ((WebConfig)et).getUpdatedBy(),(et,vl)->((WebConfig) et).setUpdatedBy(DfTypeUtil.toString(vl)), "updatedBy");
+        setupEpg(_epgMap, et-> ((WebConfig)et).getUpdatedTime(),(et,vl)->((WebConfig) et).setUpdatedTime(DfTypeUtil.toLong(vl)), "updatedTime");
+        setupEpg(_epgMap, et-> ((WebConfig)et).getUrls(),(et,vl)->((WebConfig) et).setUrls(DfTypeUtil.toString(vl)), "urls");
+        setupEpg(_epgMap, et-> ((WebConfig)et).getUserAgent(),(et,vl)->((WebConfig) et).setUserAgent(DfTypeUtil.toString(vl)), "userAgent");
     }
 
     @Override
@@ -130,155 +114,60 @@ public class WebConfigDbm extends AbstractDBMeta {
     protected final String _tableDbName = "web_config";
     protected final String _tableDispName = "web_config";
     protected final String _tablePropertyName = "WebConfig";
-
-    public String getTableDbName() {
-        return _tableDbName;
-    }
-
+    public String getTableDbName() { return _tableDbName; }
     @Override
-    public String getTableDispName() {
-        return _tableDispName;
-    }
-
+    public String getTableDispName() { return _tableDispName; }
     @Override
-    public String getTablePropertyName() {
-        return _tablePropertyName;
-    }
-
+    public String getTablePropertyName() { return _tablePropertyName; }
     @Override
-    public TableSqlName getTableSqlName() {
-        return null;
-    }
+    public TableSqlName getTableSqlName() { return null; }
 
     // ===================================================================================
     //                                                                         Column Info
     //                                                                         ===========
-    protected final ColumnInfo _columnAvailable = cci("available", "available", null, null, Boolean.class, "available", null, false, false,
-            false, "Boolean", 0, 0, null, false, null, null, null, null, null, false);
-    protected final ColumnInfo _columnBoost = cci("boost", "boost", null, null, Float.class, "boost", null, false, false, false, "Float",
-            0, 0, null, false, null, null, null, null, null, false);
-    protected final ColumnInfo _columnConfigParameter = cci("configParameter", "configParameter", null, null, String.class,
-            "configParameter", null, false, false, false, "String", 0, 0, null, false, null, null, null, null, null, false);
-    protected final ColumnInfo _columnCreatedBy = cci("createdBy", "createdBy", null, null, String.class, "createdBy", null, false, false,
-            false, "String", 0, 0, null, false, null, null, null, null, null, false);
-    protected final ColumnInfo _columnCreatedTime = cci("createdTime", "createdTime", null, null, Long.class, "createdTime", null, false,
-            false, false, "Long", 0, 0, null, false, null, null, null, null, null, false);
-    protected final ColumnInfo _columnDepth = cci("depth", "depth", null, null, Integer.class, "depth", null, false, false, false,
-            "Integer", 0, 0, null, false, null, null, null, null, null, false);
-    protected final ColumnInfo _columnExcludedDocUrls = cci("excludedDocUrls", "excludedDocUrls", null, null, String.class,
-            "excludedDocUrls", null, false, false, false, "String", 0, 0, null, false, null, null, null, null, null, false);
-    protected final ColumnInfo _columnExcludedUrls = cci("excludedUrls", "excludedUrls", null, null, String.class, "excludedUrls", null,
-            false, false, false, "String", 0, 0, null, false, null, null, null, null, null, false);
-    protected final ColumnInfo _columnIncludedDocUrls = cci("includedDocUrls", "includedDocUrls", null, null, String.class,
-            "includedDocUrls", null, false, false, false, "String", 0, 0, null, false, null, null, null, null, null, false);
-    protected final ColumnInfo _columnIncludedUrls = cci("includedUrls", "includedUrls", null, null, String.class, "includedUrls", null,
-            false, false, false, "String", 0, 0, null, false, null, null, null, null, null, false);
-    protected final ColumnInfo _columnIntervalTime = cci("intervalTime", "intervalTime", null, null, Integer.class, "intervalTime", null,
-            false, false, false, "Integer", 0, 0, null, false, null, null, null, null, null, false);
-    protected final ColumnInfo _columnTimeToLive = cci("timeToLive", "timeToLive", null, null, Integer.class, "timeToLive", null, false,
-            false, false, "Integer", 0, 0, null, false, null, null, null, null, null, false);
-    protected final ColumnInfo _columnMaxAccessCount = cci("maxAccessCount", "maxAccessCount", null, null, Long.class, "maxAccessCount",
-            null, false, false, false, "Long", 0, 0, null, false, null, null, null, null, null, false);
-    protected final ColumnInfo _columnName = cci("name", "name", null, null, String.class, "name", null, false, false, false, "String", 0,
-            0, null, false, null, null, null, null, null, false);
-    protected final ColumnInfo _columnNumOfThread = cci("numOfThread", "numOfThread", null, null, Integer.class, "numOfThread", null,
-            false, false, false, "Integer", 0, 0, null, false, null, null, null, null, null, false);
-    protected final ColumnInfo _columnPermissions = cci("permissions", "permissions", null, null, String[].class, "permissions", 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 _columnUrls = cci("urls", "urls", null, null, String.class, "urls", null, false, false, false, "String", 0,
-            0, null, false, null, null, null, null, null, false);
-    protected final ColumnInfo _columnUserAgent = cci("userAgent", "userAgent", null, null, String.class, "userAgent", null, false, false,
-            false, "String", 0, 0, null, false, null, null, null, null, null, false);
-
-    public ColumnInfo columnAvailable() {
-        return _columnAvailable;
-    }
-
-    public ColumnInfo columnBoost() {
-        return _columnBoost;
-    }
-
-    public ColumnInfo columnConfigParameter() {
-        return _columnConfigParameter;
-    }
-
-    public ColumnInfo columnCreatedBy() {
-        return _columnCreatedBy;
-    }
-
-    public ColumnInfo columnCreatedTime() {
-        return _columnCreatedTime;
-    }
-
-    public ColumnInfo columnDepth() {
-        return _columnDepth;
-    }
-
-    public ColumnInfo columnExcludedDocUrls() {
-        return _columnExcludedDocUrls;
-    }
-
-    public ColumnInfo columnExcludedUrls() {
-        return _columnExcludedUrls;
-    }
-
-    public ColumnInfo columnIncludedDocUrls() {
-        return _columnIncludedDocUrls;
-    }
-
-    public ColumnInfo columnIncludedUrls() {
-        return _columnIncludedUrls;
-    }
-
-    public ColumnInfo columnIntervalTime() {
-        return _columnIntervalTime;
-    }
-
-    public ColumnInfo columnTimeToLive() {
-        return _columnTimeToLive;
-    }
-
-    public ColumnInfo columnMaxAccessCount() {
-        return _columnMaxAccessCount;
-    }
-
-    public ColumnInfo columnName() {
-        return _columnName;
-    }
-
-    public ColumnInfo columnNumOfThread() {
-        return _columnNumOfThread;
-    }
-
-    public ColumnInfo columnPermissions() {
-        return _columnPermissions;
-    }
-
-    public ColumnInfo columnSortOrder() {
-        return _columnSortOrder;
-    }
-
-    public ColumnInfo columnUpdatedBy() {
-        return _columnUpdatedBy;
-    }
-
-    public ColumnInfo columnUpdatedTime() {
-        return _columnUpdatedTime;
-    }
-
-    public ColumnInfo columnUrls() {
-        return _columnUrls;
-    }
-
-    public ColumnInfo columnUserAgent() {
-        return _columnUserAgent;
-    }
+    protected final ColumnInfo _columnAvailable = cci("available", "available", null, null, Boolean.class, "available", null, false, false, false, "Boolean", 0, 0, null, false, null, null, null, null, null, false);
+    protected final ColumnInfo _columnBoost = cci("boost", "boost", null, null, Float.class, "boost", null, false, false, false, "Float", 0, 0, null, false, null, null, null, null, null, false);
+    protected final ColumnInfo _columnConfigParameter = cci("configParameter", "configParameter", null, null, String.class, "configParameter", null, false, false, false, "String", 0, 0, null, false, null, null, null, null, null, false);
+    protected final ColumnInfo _columnCreatedBy = cci("createdBy", "createdBy", null, null, String.class, "createdBy", null, false, false, false, "String", 0, 0, null, false, null, null, null, null, null, false);
+    protected final ColumnInfo _columnCreatedTime = cci("createdTime", "createdTime", null, null, Long.class, "createdTime", null, false, false, false, "Long", 0, 0, null, false, null, null, null, null, null, false);
+    protected final ColumnInfo _columnDepth = cci("depth", "depth", null, null, Integer.class, "depth", null, false, false, false, "Integer", 0, 0, null, false, null, null, null, null, null, false);
+    protected final ColumnInfo _columnExcludedDocUrls = cci("excludedDocUrls", "excludedDocUrls", null, null, String.class, "excludedDocUrls", null, false, false, false, "String", 0, 0, null, false, null, null, null, null, null, false);
+    protected final ColumnInfo _columnExcludedUrls = cci("excludedUrls", "excludedUrls", null, null, String.class, "excludedUrls", null, false, false, false, "String", 0, 0, null, false, null, null, null, null, null, false);
+    protected final ColumnInfo _columnIncludedDocUrls = cci("includedDocUrls", "includedDocUrls", null, null, String.class, "includedDocUrls", null, false, false, false, "String", 0, 0, null, false, null, null, null, null, null, false);
+    protected final ColumnInfo _columnIncludedUrls = cci("includedUrls", "includedUrls", null, null, String.class, "includedUrls", null, false, false, false, "String", 0, 0, null, false, null, null, null, null, null, false);
+    protected final ColumnInfo _columnIntervalTime = cci("intervalTime", "intervalTime", null, null, Integer.class, "intervalTime", null, false, false, false, "Integer", 0, 0, null, false, null, null, null, null, null, false);
+    protected final ColumnInfo _columnTimeToLive = cci("timeToLive", "timeToLive", null, null, Integer.class, "timeToLive", null, false, false, false, "Integer", 0, 0, null, false, null, null, null, null, null, false);
+    protected final ColumnInfo _columnMaxAccessCount = cci("maxAccessCount", "maxAccessCount", null, null, Long.class, "maxAccessCount", null, false, false, false, "Long", 0, 0, null, false, null, null, null, null, null, false);
+    protected final ColumnInfo _columnName = cci("name", "name", null, null, String.class, "name", null, false, false, false, "String", 0, 0, null, false, null, null, null, null, null, false);
+    protected final ColumnInfo _columnNumOfThread = cci("numOfThread", "numOfThread", null, null, Integer.class, "numOfThread", null, false, false, false, "Integer", 0, 0, null, false, null, null, null, null, null, false);
+    protected final ColumnInfo _columnPermissions = cci("permissions", "permissions", null, null, String[].class, "permissions", 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 _columnUrls = cci("urls", "urls", null, null, String.class, "urls", null, false, false, false, "String", 0, 0, null, false, null, null, null, null, null, false);
+    protected final ColumnInfo _columnUserAgent = cci("userAgent", "userAgent", null, null, String.class, "userAgent", null, false, false, false, "String", 0, 0, null, false, null, null, null, null, null, false);
+
+    public ColumnInfo columnAvailable() { return _columnAvailable; }
+    public ColumnInfo columnBoost() { return _columnBoost; }
+    public ColumnInfo columnConfigParameter() { return _columnConfigParameter; }
+    public ColumnInfo columnCreatedBy() { return _columnCreatedBy; }
+    public ColumnInfo columnCreatedTime() { return _columnCreatedTime; }
+    public ColumnInfo columnDepth() { return _columnDepth; }
+    public ColumnInfo columnExcludedDocUrls() { return _columnExcludedDocUrls; }
+    public ColumnInfo columnExcludedUrls() { return _columnExcludedUrls; }
+    public ColumnInfo columnIncludedDocUrls() { return _columnIncludedDocUrls; }
+    public ColumnInfo columnIncludedUrls() { return _columnIncludedUrls; }
+    public ColumnInfo columnIntervalTime() { return _columnIntervalTime; }
+    public ColumnInfo columnTimeToLive() { return _columnTimeToLive; }
+    public ColumnInfo columnMaxAccessCount() { return _columnMaxAccessCount; }
+    public ColumnInfo columnName() { return _columnName; }
+    public ColumnInfo columnNumOfThread() { return _columnNumOfThread; }
+    public ColumnInfo columnPermissions() { return _columnPermissions; }
+    public ColumnInfo columnSortOrder() { return _columnSortOrder; }
+    public ColumnInfo columnUpdatedBy() { return _columnUpdatedBy; }
+    public ColumnInfo columnUpdatedTime() { return _columnUpdatedTime; }
+    public ColumnInfo columnUrls() { return _columnUrls; }
+    public ColumnInfo columnUserAgent() { return _columnUserAgent; }
 
     protected List<ColumnInfo> ccil() {
         List<ColumnInfo> ls = newArrayList();
@@ -379,3 +268,4 @@ public class WebConfigDbm extends AbstractDBMeta {
         return null;
     }
 }
+

+ 13 - 32
src/main/java/org/codelibs/fess/es/config/bsentity/dbmeta/WebConfigToLabelDbm.java

@@ -15,11 +15,12 @@
  */
 package org.codelibs.fess.es.config.bsentity.dbmeta;
 
-import java.time.LocalDateTime;
+import java.time.*;
 import java.util.List;
 import java.util.Map;
 
 import org.codelibs.fess.es.config.exentity.WebConfigToLabel;
+
 import org.dbflute.Entity;
 import org.dbflute.dbmeta.AbstractDBMeta;
 import org.dbflute.dbmeta.info.ColumnInfo;
@@ -79,10 +80,8 @@ public class WebConfigToLabelDbm extends AbstractDBMeta {
     //                                       ---------------
     protected final Map<String, PropertyGateway> _epgMap = newHashMap();
     {
-        setupEpg(_epgMap, et -> ((WebConfigToLabel) et).getLabelTypeId(),
-                (et, vl) -> ((WebConfigToLabel) et).setLabelTypeId(DfTypeUtil.toString(vl)), "labelTypeId");
-        setupEpg(_epgMap, et -> ((WebConfigToLabel) et).getWebConfigId(),
-                (et, vl) -> ((WebConfigToLabel) et).setWebConfigId(DfTypeUtil.toString(vl)), "webConfigId");
+        setupEpg(_epgMap, et-> ((WebConfigToLabel)et).getLabelTypeId(),(et,vl)->((WebConfigToLabel) et).setLabelTypeId(DfTypeUtil.toString(vl)), "labelTypeId");
+        setupEpg(_epgMap, et-> ((WebConfigToLabel)et).getWebConfigId(),(et,vl)->((WebConfigToLabel) et).setWebConfigId(DfTypeUtil.toString(vl)), "webConfigId");
     }
 
     @Override
@@ -96,41 +95,22 @@ public class WebConfigToLabelDbm extends AbstractDBMeta {
     protected final String _tableDbName = "web_config_to_label";
     protected final String _tableDispName = "web_config_to_label";
     protected final String _tablePropertyName = "WebConfigToLabel";
-
-    public String getTableDbName() {
-        return _tableDbName;
-    }
-
+    public String getTableDbName() { return _tableDbName; }
     @Override
-    public String getTableDispName() {
-        return _tableDispName;
-    }
-
+    public String getTableDispName() { return _tableDispName; }
     @Override
-    public String getTablePropertyName() {
-        return _tablePropertyName;
-    }
-
+    public String getTablePropertyName() { return _tablePropertyName; }
     @Override
-    public TableSqlName getTableSqlName() {
-        return null;
-    }
+    public TableSqlName getTableSqlName() { return null; }
 
     // ===================================================================================
     //                                                                         Column Info
     //                                                                         ===========
-    protected final ColumnInfo _columnLabelTypeId = cci("labelTypeId", "labelTypeId", null, null, String.class, "labelTypeId", null, false,
-            false, false, "String", 0, 0, null, false, null, null, null, null, null, false);
-    protected final ColumnInfo _columnWebConfigId = cci("webConfigId", "webConfigId", null, null, String.class, "webConfigId", null, false,
-            false, false, "String", 0, 0, null, false, null, null, null, null, null, false);
+    protected final ColumnInfo _columnLabelTypeId = cci("labelTypeId", "labelTypeId", null, null, String.class, "labelTypeId", null, false, false, false, "String", 0, 0, null, false, null, null, null, null, null, false);
+    protected final ColumnInfo _columnWebConfigId = cci("webConfigId", "webConfigId", null, null, String.class, "webConfigId", null, false, false, false, "String", 0, 0, null, false, null, null, null, null, null, false);
 
-    public ColumnInfo columnLabelTypeId() {
-        return _columnLabelTypeId;
-    }
-
-    public ColumnInfo columnWebConfigId() {
-        return _columnWebConfigId;
-    }
+    public ColumnInfo columnLabelTypeId() { return _columnLabelTypeId; }
+    public ColumnInfo columnWebConfigId() { return _columnWebConfigId; }
 
     protected List<ColumnInfo> ccil() {
         List<ColumnInfo> ls = newArrayList();
@@ -212,3 +192,4 @@ public class WebConfigToLabelDbm extends AbstractDBMeta {
         return null;
     }
 }
+

+ 13 - 32
src/main/java/org/codelibs/fess/es/config/bsentity/dbmeta/WebConfigToRoleDbm.java

@@ -15,11 +15,12 @@
  */
 package org.codelibs.fess.es.config.bsentity.dbmeta;
 
-import java.time.LocalDateTime;
+import java.time.*;
 import java.util.List;
 import java.util.Map;
 
 import org.codelibs.fess.es.config.exentity.WebConfigToRole;
+
 import org.dbflute.Entity;
 import org.dbflute.dbmeta.AbstractDBMeta;
 import org.dbflute.dbmeta.info.ColumnInfo;
@@ -79,10 +80,8 @@ public class WebConfigToRoleDbm extends AbstractDBMeta {
     //                                       ---------------
     protected final Map<String, PropertyGateway> _epgMap = newHashMap();
     {
-        setupEpg(_epgMap, et -> ((WebConfigToRole) et).getRoleTypeId(),
-                (et, vl) -> ((WebConfigToRole) et).setRoleTypeId(DfTypeUtil.toString(vl)), "roleTypeId");
-        setupEpg(_epgMap, et -> ((WebConfigToRole) et).getWebConfigId(),
-                (et, vl) -> ((WebConfigToRole) et).setWebConfigId(DfTypeUtil.toString(vl)), "webConfigId");
+        setupEpg(_epgMap, et-> ((WebConfigToRole)et).getRoleTypeId(),(et,vl)->((WebConfigToRole) et).setRoleTypeId(DfTypeUtil.toString(vl)), "roleTypeId");
+        setupEpg(_epgMap, et-> ((WebConfigToRole)et).getWebConfigId(),(et,vl)->((WebConfigToRole) et).setWebConfigId(DfTypeUtil.toString(vl)), "webConfigId");
     }
 
     @Override
@@ -96,41 +95,22 @@ public class WebConfigToRoleDbm extends AbstractDBMeta {
     protected final String _tableDbName = "web_config_to_role";
     protected final String _tableDispName = "web_config_to_role";
     protected final String _tablePropertyName = "WebConfigToRole";
-
-    public String getTableDbName() {
-        return _tableDbName;
-    }
-
+    public String getTableDbName() { return _tableDbName; }
     @Override
-    public String getTableDispName() {
-        return _tableDispName;
-    }
-
+    public String getTableDispName() { return _tableDispName; }
     @Override
-    public String getTablePropertyName() {
-        return _tablePropertyName;
-    }
-
+    public String getTablePropertyName() { return _tablePropertyName; }
     @Override
-    public TableSqlName getTableSqlName() {
-        return null;
-    }
+    public TableSqlName getTableSqlName() { return null; }
 
     // ===================================================================================
     //                                                                         Column Info
     //                                                                         ===========
-    protected final ColumnInfo _columnRoleTypeId = cci("roleTypeId", "roleTypeId", null, null, String.class, "roleTypeId", null, false,
-            false, false, "String", 0, 0, null, false, null, null, null, null, null, false);
-    protected final ColumnInfo _columnWebConfigId = cci("webConfigId", "webConfigId", null, null, String.class, "webConfigId", null, false,
-            false, false, "String", 0, 0, null, false, null, null, null, null, null, false);
+    protected final ColumnInfo _columnRoleTypeId = cci("roleTypeId", "roleTypeId", null, null, String.class, "roleTypeId", null, false, false, false, "String", 0, 0, null, false, null, null, null, null, null, false);
+    protected final ColumnInfo _columnWebConfigId = cci("webConfigId", "webConfigId", null, null, String.class, "webConfigId", null, false, false, false, "String", 0, 0, null, false, null, null, null, null, null, false);
 
-    public ColumnInfo columnRoleTypeId() {
-        return _columnRoleTypeId;
-    }
-
-    public ColumnInfo columnWebConfigId() {
-        return _columnWebConfigId;
-    }
+    public ColumnInfo columnRoleTypeId() { return _columnRoleTypeId; }
+    public ColumnInfo columnWebConfigId() { return _columnWebConfigId; }
 
     protected List<ColumnInfo> ccil() {
         List<ColumnInfo> ls = newArrayList();
@@ -212,3 +192,4 @@ public class WebConfigToRoleDbm extends AbstractDBMeta {
         return null;
     }
 }
+

+ 1 - 7
src/main/java/org/codelibs/fess/es/config/cbean/bs/BsBadWordCB.java

@@ -75,7 +75,7 @@ public class BsBadWordCB extends EsAbstractConditionBean {
 
     @Override
     public void acceptPrimaryKeyMap(Map<String, ? extends Object> primaryKeyMap) {
-        acceptPK((String) primaryKeyMap.get("_id"));
+        acceptPK((String)primaryKeyMap.get("_id"));
     }
 
     // ===================================================================================
@@ -161,27 +161,21 @@ public class BsBadWordCB extends EsAbstractConditionBean {
         public void columnCreatedBy() {
             doColumn("createdBy");
         }
-
         public void columnCreatedTime() {
             doColumn("createdTime");
         }
-
         public void columnSuggestWord() {
             doColumn("suggestWord");
         }
-
         public void columnTargetLabel() {
             doColumn("targetLabel");
         }
-
         public void columnTargetRole() {
             doColumn("targetRole");
         }
-
         public void columnUpdatedBy() {
             doColumn("updatedBy");
         }
-
         public void columnUpdatedTime() {
             doColumn("updatedTime");
         }

+ 1 - 7
src/main/java/org/codelibs/fess/es/config/cbean/bs/BsBoostDocumentRuleCB.java

@@ -75,7 +75,7 @@ public class BsBoostDocumentRuleCB extends EsAbstractConditionBean {
 
     @Override
     public void acceptPrimaryKeyMap(Map<String, ? extends Object> primaryKeyMap) {
-        acceptPK((String) primaryKeyMap.get("_id"));
+        acceptPK((String)primaryKeyMap.get("_id"));
     }
 
     // ===================================================================================
@@ -161,27 +161,21 @@ public class BsBoostDocumentRuleCB extends EsAbstractConditionBean {
         public void columnBoostExpr() {
             doColumn("boostExpr");
         }
-
         public void columnCreatedBy() {
             doColumn("createdBy");
         }
-
         public void columnCreatedTime() {
             doColumn("createdTime");
         }
-
         public void columnSortOrder() {
             doColumn("sortOrder");
         }
-
         public void columnUpdatedBy() {
             doColumn("updatedBy");
         }
-
         public void columnUpdatedTime() {
             doColumn("updatedTime");
         }
-
         public void columnUrlExpr() {
             doColumn("urlExpr");
         }

+ 1 - 4
src/main/java/org/codelibs/fess/es/config/cbean/bs/BsCrawlingInfoCB.java

@@ -75,7 +75,7 @@ public class BsCrawlingInfoCB extends EsAbstractConditionBean {
 
     @Override
     public void acceptPrimaryKeyMap(Map<String, ? extends Object> primaryKeyMap) {
-        acceptPK((String) primaryKeyMap.get("_id"));
+        acceptPK((String)primaryKeyMap.get("_id"));
     }
 
     // ===================================================================================
@@ -161,15 +161,12 @@ public class BsCrawlingInfoCB extends EsAbstractConditionBean {
         public void columnCreatedTime() {
             doColumn("createdTime");
         }
-
         public void columnExpiredTime() {
             doColumn("expiredTime");
         }
-
         public void columnName() {
             doColumn("name");
         }
-
         public void columnSessionId() {
             doColumn("sessionId");
         }

+ 1 - 4
src/main/java/org/codelibs/fess/es/config/cbean/bs/BsCrawlingInfoParamCB.java

@@ -75,7 +75,7 @@ public class BsCrawlingInfoParamCB extends EsAbstractConditionBean {
 
     @Override
     public void acceptPrimaryKeyMap(Map<String, ? extends Object> primaryKeyMap) {
-        acceptPK((String) primaryKeyMap.get("_id"));
+        acceptPK((String)primaryKeyMap.get("_id"));
     }
 
     // ===================================================================================
@@ -161,15 +161,12 @@ public class BsCrawlingInfoParamCB extends EsAbstractConditionBean {
         public void columnCrawlingInfoId() {
             doColumn("crawlingInfoId");
         }
-
         public void columnCreatedTime() {
             doColumn("createdTime");
         }
-
         public void columnKey() {
             doColumn("key");
         }
-
         public void columnValue() {
             doColumn("value");
         }

+ 1 - 12
src/main/java/org/codelibs/fess/es/config/cbean/bs/BsDataConfigCB.java

@@ -75,7 +75,7 @@ public class BsDataConfigCB extends EsAbstractConditionBean {
 
     @Override
     public void acceptPrimaryKeyMap(Map<String, ? extends Object> primaryKeyMap) {
-        acceptPK((String) primaryKeyMap.get("_id"));
+        acceptPK((String)primaryKeyMap.get("_id"));
     }
 
     // ===================================================================================
@@ -161,47 +161,36 @@ public class BsDataConfigCB extends EsAbstractConditionBean {
         public void columnAvailable() {
             doColumn("available");
         }
-
         public void columnBoost() {
             doColumn("boost");
         }
-
         public void columnCreatedBy() {
             doColumn("createdBy");
         }
-
         public void columnCreatedTime() {
             doColumn("createdTime");
         }
-
         public void columnHandlerName() {
             doColumn("handlerName");
         }
-
         public void columnHandlerParameter() {
             doColumn("handlerParameter");
         }
-
         public void columnHandlerScript() {
             doColumn("handlerScript");
         }
-
         public void columnName() {
             doColumn("name");
         }
-
         public void columnPermissions() {
             doColumn("permissions");
         }
-
         public void columnSortOrder() {
             doColumn("sortOrder");
         }
-
         public void columnUpdatedBy() {
             doColumn("updatedBy");
         }
-
         public void columnUpdatedTime() {
             doColumn("updatedTime");
         }

+ 1 - 2
src/main/java/org/codelibs/fess/es/config/cbean/bs/BsDataConfigToLabelCB.java

@@ -75,7 +75,7 @@ public class BsDataConfigToLabelCB extends EsAbstractConditionBean {
 
     @Override
     public void acceptPrimaryKeyMap(Map<String, ? extends Object> primaryKeyMap) {
-        acceptPK((String) primaryKeyMap.get("_id"));
+        acceptPK((String)primaryKeyMap.get("_id"));
     }
 
     // ===================================================================================
@@ -161,7 +161,6 @@ public class BsDataConfigToLabelCB extends EsAbstractConditionBean {
         public void columnDataConfigId() {
             doColumn("dataConfigId");
         }
-
         public void columnLabelTypeId() {
             doColumn("labelTypeId");
         }

+ 1 - 2
src/main/java/org/codelibs/fess/es/config/cbean/bs/BsDataConfigToRoleCB.java

@@ -75,7 +75,7 @@ public class BsDataConfigToRoleCB extends EsAbstractConditionBean {
 
     @Override
     public void acceptPrimaryKeyMap(Map<String, ? extends Object> primaryKeyMap) {
-        acceptPK((String) primaryKeyMap.get("_id"));
+        acceptPK((String)primaryKeyMap.get("_id"));
     }
 
     // ===================================================================================
@@ -161,7 +161,6 @@ public class BsDataConfigToRoleCB extends EsAbstractConditionBean {
         public void columnDataConfigId() {
             doColumn("dataConfigId");
         }
-
         public void columnRoleTypeId() {
             doColumn("roleTypeId");
         }

+ 1 - 7
src/main/java/org/codelibs/fess/es/config/cbean/bs/BsDuplicateHostCB.java

@@ -75,7 +75,7 @@ public class BsDuplicateHostCB extends EsAbstractConditionBean {
 
     @Override
     public void acceptPrimaryKeyMap(Map<String, ? extends Object> primaryKeyMap) {
-        acceptPK((String) primaryKeyMap.get("_id"));
+        acceptPK((String)primaryKeyMap.get("_id"));
     }
 
     // ===================================================================================
@@ -161,27 +161,21 @@ public class BsDuplicateHostCB extends EsAbstractConditionBean {
         public void columnCreatedBy() {
             doColumn("createdBy");
         }
-
         public void columnCreatedTime() {
             doColumn("createdTime");
         }
-
         public void columnDuplicateHostName() {
             doColumn("duplicateHostName");
         }
-
         public void columnRegularName() {
             doColumn("regularName");
         }
-
         public void columnSortOrder() {
             doColumn("sortOrder");
         }
-
         public void columnUpdatedBy() {
             doColumn("updatedBy");
         }
-
         public void columnUpdatedTime() {
             doColumn("updatedTime");
         }

+ 1 - 9
src/main/java/org/codelibs/fess/es/config/cbean/bs/BsElevateWordCB.java

@@ -75,7 +75,7 @@ public class BsElevateWordCB extends EsAbstractConditionBean {
 
     @Override
     public void acceptPrimaryKeyMap(Map<String, ? extends Object> primaryKeyMap) {
-        acceptPK((String) primaryKeyMap.get("_id"));
+        acceptPK((String)primaryKeyMap.get("_id"));
     }
 
     // ===================================================================================
@@ -161,35 +161,27 @@ public class BsElevateWordCB extends EsAbstractConditionBean {
         public void columnBoost() {
             doColumn("boost");
         }
-
         public void columnCreatedBy() {
             doColumn("createdBy");
         }
-
         public void columnCreatedTime() {
             doColumn("createdTime");
         }
-
         public void columnReading() {
             doColumn("reading");
         }
-
         public void columnSuggestWord() {
             doColumn("suggestWord");
         }
-
         public void columnTargetLabel() {
             doColumn("targetLabel");
         }
-
         public void columnTargetRole() {
             doColumn("targetRole");
         }
-
         public void columnUpdatedBy() {
             doColumn("updatedBy");
         }
-
         public void columnUpdatedTime() {
             doColumn("updatedTime");
         }

+ 1 - 2
src/main/java/org/codelibs/fess/es/config/cbean/bs/BsElevateWordToLabelCB.java

@@ -75,7 +75,7 @@ public class BsElevateWordToLabelCB extends EsAbstractConditionBean {
 
     @Override
     public void acceptPrimaryKeyMap(Map<String, ? extends Object> primaryKeyMap) {
-        acceptPK((String) primaryKeyMap.get("_id"));
+        acceptPK((String)primaryKeyMap.get("_id"));
     }
 
     // ===================================================================================
@@ -161,7 +161,6 @@ public class BsElevateWordToLabelCB extends EsAbstractConditionBean {
         public void columnElevateWordId() {
             doColumn("elevateWordId");
         }
-
         public void columnLabelTypeId() {
             doColumn("labelTypeId");
         }

+ 1 - 7
src/main/java/org/codelibs/fess/es/config/cbean/bs/BsFailureUrlCB.java

@@ -75,7 +75,7 @@ public class BsFailureUrlCB extends EsAbstractConditionBean {
 
     @Override
     public void acceptPrimaryKeyMap(Map<String, ? extends Object> primaryKeyMap) {
-        acceptPK((String) primaryKeyMap.get("_id"));
+        acceptPK((String)primaryKeyMap.get("_id"));
     }
 
     // ===================================================================================
@@ -161,27 +161,21 @@ public class BsFailureUrlCB extends EsAbstractConditionBean {
         public void columnConfigId() {
             doColumn("configId");
         }
-
         public void columnErrorCount() {
             doColumn("errorCount");
         }
-
         public void columnErrorLog() {
             doColumn("errorLog");
         }
-
         public void columnErrorName() {
             doColumn("errorName");
         }
-
         public void columnLastAccessTime() {
             doColumn("lastAccessTime");
         }
-
         public void columnThreadName() {
             doColumn("threadName");
         }
-
         public void columnUrl() {
             doColumn("url");
         }

+ 1 - 11
src/main/java/org/codelibs/fess/es/config/cbean/bs/BsFileAuthenticationCB.java

@@ -75,7 +75,7 @@ public class BsFileAuthenticationCB extends EsAbstractConditionBean {
 
     @Override
     public void acceptPrimaryKeyMap(Map<String, ? extends Object> primaryKeyMap) {
-        acceptPK((String) primaryKeyMap.get("_id"));
+        acceptPK((String)primaryKeyMap.get("_id"));
     }
 
     // ===================================================================================
@@ -161,43 +161,33 @@ public class BsFileAuthenticationCB extends EsAbstractConditionBean {
         public void columnCreatedBy() {
             doColumn("createdBy");
         }
-
         public void columnCreatedTime() {
             doColumn("createdTime");
         }
-
         public void columnFileConfigId() {
             doColumn("fileConfigId");
         }
-
         public void columnHostname() {
             doColumn("hostname");
         }
-
         public void columnParameters() {
             doColumn("parameters");
         }
-
         public void columnPassword() {
             doColumn("password");
         }
-
         public void columnPort() {
             doColumn("port");
         }
-
         public void columnProtocolScheme() {
             doColumn("protocolScheme");
         }
-
         public void columnUpdatedBy() {
             doColumn("updatedBy");
         }
-
         public void columnUpdatedTime() {
             doColumn("updatedTime");
         }
-
         public void columnUsername() {
             doColumn("username");
         }

+ 1 - 20
src/main/java/org/codelibs/fess/es/config/cbean/bs/BsFileConfigCB.java

@@ -75,7 +75,7 @@ public class BsFileConfigCB extends EsAbstractConditionBean {
 
     @Override
     public void acceptPrimaryKeyMap(Map<String, ? extends Object> primaryKeyMap) {
-        acceptPK((String) primaryKeyMap.get("_id"));
+        acceptPK((String)primaryKeyMap.get("_id"));
     }
 
     // ===================================================================================
@@ -161,79 +161,60 @@ public class BsFileConfigCB extends EsAbstractConditionBean {
         public void columnAvailable() {
             doColumn("available");
         }
-
         public void columnBoost() {
             doColumn("boost");
         }
-
         public void columnConfigParameter() {
             doColumn("configParameter");
         }
-
         public void columnCreatedBy() {
             doColumn("createdBy");
         }
-
         public void columnCreatedTime() {
             doColumn("createdTime");
         }
-
         public void columnDepth() {
             doColumn("depth");
         }
-
         public void columnExcludedDocPaths() {
             doColumn("excludedDocPaths");
         }
-
         public void columnExcludedPaths() {
             doColumn("excludedPaths");
         }
-
         public void columnIncludedDocPaths() {
             doColumn("includedDocPaths");
         }
-
         public void columnIncludedPaths() {
             doColumn("includedPaths");
         }
-
         public void columnIntervalTime() {
             doColumn("intervalTime");
         }
-
         public void columnTimeToLive() {
             doColumn("timeToLive");
         }
-
         public void columnMaxAccessCount() {
             doColumn("maxAccessCount");
         }
-
         public void columnName() {
             doColumn("name");
         }
-
         public void columnNumOfThread() {
             doColumn("numOfThread");
         }
-
         public void columnPaths() {
             doColumn("paths");
         }
-
         public void columnPermissions() {
             doColumn("permissions");
         }
-
         public void columnSortOrder() {
             doColumn("sortOrder");
         }
-
         public void columnUpdatedBy() {
             doColumn("updatedBy");
         }
-
         public void columnUpdatedTime() {
             doColumn("updatedTime");
         }

+ 1 - 2
src/main/java/org/codelibs/fess/es/config/cbean/bs/BsFileConfigToLabelCB.java

@@ -75,7 +75,7 @@ public class BsFileConfigToLabelCB extends EsAbstractConditionBean {
 
     @Override
     public void acceptPrimaryKeyMap(Map<String, ? extends Object> primaryKeyMap) {
-        acceptPK((String) primaryKeyMap.get("_id"));
+        acceptPK((String)primaryKeyMap.get("_id"));
     }
 
     // ===================================================================================
@@ -161,7 +161,6 @@ public class BsFileConfigToLabelCB extends EsAbstractConditionBean {
         public void columnFileConfigId() {
             doColumn("fileConfigId");
         }
-
         public void columnLabelTypeId() {
             doColumn("labelTypeId");
         }

Alguns arquivos não foram mostrados porque muitos arquivos mudaram nesse diff