diff --git a/src/main/java/org/codelibs/fess/app/web/base/FessSearchAction.java b/src/main/java/org/codelibs/fess/app/web/base/FessSearchAction.java index 0310d3df9..4b458a177 100644 --- a/src/main/java/org/codelibs/fess/app/web/base/FessSearchAction.java +++ b/src/main/java/org/codelibs/fess/app/web/base/FessSearchAction.java @@ -121,7 +121,7 @@ public abstract class FessSearchAction extends FessBaseAction { } runtime.registerData("langItems", systemHelper.getLanguageItems(locale)); runtime.registerData("username", systemHelper.getUsername()); - + runtime.registerData("pageLoginLink", fessConfig.isPageLoginLink()); } diff --git a/src/main/java/org/codelibs/fess/es/config/allcommon/EsAbstractBehavior.java b/src/main/java/org/codelibs/fess/es/config/allcommon/EsAbstractBehavior.java index 59b139088..9185ceb50 100644 --- a/src/main/java/org/codelibs/fess/es/config/allcommon/EsAbstractBehavior.java +++ b/src/main/java/org/codelibs/fess/es/config/allcommon/EsAbstractBehavior.java @@ -25,11 +25,8 @@ 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; @@ -74,8 +71,11 @@ public abstract class EsAbstractBehavior RESULT createEntity(Map source, Class entityType); // =================================================================================== @@ -192,8 +192,9 @@ public abstract class EsAbstractBehavior handler) { - final SearchRequestBuilder builder = client.prepareSearch(asEsIndex()).setTypes(asEsIndexType()).setSearchType(SearchType.SCAN) - .setScroll(scrollForCursor).setSize(sizeForCursor); + final SearchRequestBuilder builder = + client.prepareSearch(asEsIndex()).setTypes(asEsIndexType()).setSearchType(SearchType.SCAN).setScroll(scrollForCursor) + .setSize(sizeForCursor); ((EsAbstractConditionBean) cb).request().build(builder); final SearchResponse response = ((EsAbstractConditionBean) cb).build(builder).execute().actionGet(); @@ -301,8 +302,9 @@ public abstract class EsAbstractBehavior option) { - final SearchRequestBuilder builder = client.prepareSearch(asEsIndex()).setTypes(asEsIndexType()).setSearchType(SearchType.SCAN) - .setScroll(scrollForDelete).setSize(sizeForDelete); + final SearchRequestBuilder builder = + client.prepareSearch(asEsIndex()).setTypes(asEsIndexType()).setSearchType(SearchType.SCAN).setScroll(scrollForDelete) + .setSize(sizeForDelete); ((EsAbstractConditionBean) cb).request().build(builder); final SearchResponse response = ((EsAbstractConditionBean) cb).build(builder).execute().actionGet(); @@ -412,6 +414,7 @@ public abstract class EsAbstractBehavior mustList, List shouldList, List mustNotList, List filterList) { + protected BoolQueryBuilder regBoolCQ(List mustList, List shouldList, List mustNotList, + List filterList) { assertObjectNotNull("mustList", mustList); assertObjectNotNull("shouldList", shouldList); assertObjectNotNull("mustNotList", mustNotList); @@ -272,7 +273,6 @@ 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,4 +479,3 @@ public abstract class EsAbstractConditionQuery implements ConditionQuery { void callback(CQ and); } } - diff --git a/src/main/java/org/codelibs/fess/es/config/allcommon/EsAbstractEntity.java b/src/main/java/org/codelibs/fess/es/config/allcommon/EsAbstractEntity.java index d22a07606..48b8c03b8 100644 --- a/src/main/java/org/codelibs/fess/es/config/allcommon/EsAbstractEntity.java +++ b/src/main/java/org/codelibs/fess/es/config/allcommon/EsAbstractEntity.java @@ -283,4 +283,3 @@ public abstract class EsAbstractEntity implements Entity, Serializable, Cloneabl void callback(OP op); } } - diff --git a/src/main/java/org/codelibs/fess/es/config/allcommon/EsPagingResultBean.java b/src/main/java/org/codelibs/fess/es/config/allcommon/EsPagingResultBean.java index dee74f25e..52b1fb559 100644 --- a/src/main/java/org/codelibs/fess/es/config/allcommon/EsPagingResultBean.java +++ b/src/main/java/org/codelibs/fess/es/config/allcommon/EsPagingResultBean.java @@ -62,4 +62,3 @@ public class EsPagingResultBean extends PagingResultBean { this.failedShards = failedShards; } } - diff --git a/src/main/java/org/codelibs/fess/es/config/bsbhv/BsBadWordBhv.java b/src/main/java/org/codelibs/fess/es/config/bsbhv/BsBadWordBhv.java index 3687da77e..f375b9c68 100644 --- a/src/main/java/org/codelibs/fess/es/config/bsbhv/BsBadWordBhv.java +++ b/src/main/java/org/codelibs/fess/es/config/bsbhv/BsBadWordBhv.java @@ -103,8 +103,7 @@ public abstract class BsBadWordBhv extends EsAbstractBehavior OptionalEntity doSelectOptionalEntity(BadWordCB cb, - Class tp) { + protected OptionalEntity doSelectOptionalEntity(BadWordCB cb, Class tp) { return createOptionalEntity(doSelectEntity(cb, tp), cb); } @@ -172,7 +171,7 @@ public abstract class BsBadWordBhv extends EsAbstractBehavior cbLambda, EntityRowHandler> entityLambda) { - delegateSelectBulk(createCB(cbLambda), entityLambda,typeOfSelectedEntity()); + delegateSelectBulk(createCB(cbLambda), entityLambda, typeOfSelectedEntity()); } // =================================================================================== @@ -267,4 +266,3 @@ public abstract class BsBadWordBhv extends EsAbstractBehavior cbLambda, EntityRowHandler> entityLambda) { - delegateSelectBulk(createCB(cbLambda), entityLambda,typeOfSelectedEntity()); + delegateSelectBulk(createCB(cbLambda), entityLambda, typeOfSelectedEntity()); } // =================================================================================== @@ -267,4 +267,3 @@ public abstract class BsBoostDocumentRuleBhv extends EsAbstractBehavior OptionalEntity doSelectOptionalEntity(CrawlingInfoCB cb, - Class tp) { + protected OptionalEntity doSelectOptionalEntity(CrawlingInfoCB cb, Class tp) { return createOptionalEntity(doSelectEntity(cb, tp), cb); } @@ -169,7 +168,7 @@ public abstract class BsCrawlingInfoBhv extends EsAbstractBehavior cbLambda, EntityRowHandler> entityLambda) { - delegateSelectBulk(createCB(cbLambda), entityLambda,typeOfSelectedEntity()); + delegateSelectBulk(createCB(cbLambda), entityLambda, typeOfSelectedEntity()); } // =================================================================================== @@ -264,4 +263,3 @@ public abstract class BsCrawlingInfoBhv extends EsAbstractBehavior cbLambda, EntityRowHandler> entityLambda) { - delegateSelectBulk(createCB(cbLambda), entityLambda,typeOfSelectedEntity()); + delegateSelectBulk(createCB(cbLambda), entityLambda, typeOfSelectedEntity()); } // =================================================================================== @@ -264,4 +264,3 @@ public abstract class BsCrawlingInfoParamBhv extends EsAbstractBehavior OptionalEntity doSelectOptionalEntity(DataConfigCB cb, - Class tp) { + protected OptionalEntity doSelectOptionalEntity(DataConfigCB cb, Class tp) { return createOptionalEntity(doSelectEntity(cb, tp), cb); } @@ -177,7 +176,7 @@ public abstract class BsDataConfigBhv extends EsAbstractBehavior cbLambda, EntityRowHandler> entityLambda) { - delegateSelectBulk(createCB(cbLambda), entityLambda,typeOfSelectedEntity()); + delegateSelectBulk(createCB(cbLambda), entityLambda, typeOfSelectedEntity()); } // =================================================================================== @@ -272,4 +271,3 @@ public abstract class BsDataConfigBhv extends EsAbstractBehavior cbLambda, EntityRowHandler> entityLambda) { - delegateSelectBulk(createCB(cbLambda), entityLambda,typeOfSelectedEntity()); + delegateSelectBulk(createCB(cbLambda), entityLambda, typeOfSelectedEntity()); } // =================================================================================== @@ -262,4 +262,3 @@ public abstract class BsDataConfigToLabelBhv extends EsAbstractBehavior cbLambda, EntityRowHandler> entityLambda) { - delegateSelectBulk(createCB(cbLambda), entityLambda,typeOfSelectedEntity()); + delegateSelectBulk(createCB(cbLambda), entityLambda, typeOfSelectedEntity()); } // =================================================================================== @@ -262,4 +262,3 @@ public abstract class BsDataConfigToRoleBhv extends EsAbstractBehavior OptionalEntity doSelectOptionalEntity(DuplicateHostCB cb, - Class tp) { + protected OptionalEntity doSelectOptionalEntity(DuplicateHostCB cb, Class tp) { return createOptionalEntity(doSelectEntity(cb, tp), cb); } @@ -172,7 +171,7 @@ public abstract class BsDuplicateHostBhv extends EsAbstractBehavior cbLambda, EntityRowHandler> entityLambda) { - delegateSelectBulk(createCB(cbLambda), entityLambda,typeOfSelectedEntity()); + delegateSelectBulk(createCB(cbLambda), entityLambda, typeOfSelectedEntity()); } // =================================================================================== @@ -267,4 +266,3 @@ public abstract class BsDuplicateHostBhv extends EsAbstractBehavior OptionalEntity doSelectOptionalEntity(ElevateWordCB cb, - Class tp) { + protected OptionalEntity doSelectOptionalEntity(ElevateWordCB cb, Class tp) { return createOptionalEntity(doSelectEntity(cb, tp), cb); } @@ -174,7 +173,7 @@ public abstract class BsElevateWordBhv extends EsAbstractBehavior cbLambda, EntityRowHandler> entityLambda) { - delegateSelectBulk(createCB(cbLambda), entityLambda,typeOfSelectedEntity()); + delegateSelectBulk(createCB(cbLambda), entityLambda, typeOfSelectedEntity()); } // =================================================================================== @@ -269,4 +268,3 @@ public abstract class BsElevateWordBhv extends EsAbstractBehavior cbLambda, EntityRowHandler> entityLambda) { - delegateSelectBulk(createCB(cbLambda), entityLambda,typeOfSelectedEntity()); + delegateSelectBulk(createCB(cbLambda), entityLambda, typeOfSelectedEntity()); } // =================================================================================== @@ -262,4 +262,3 @@ public abstract class BsElevateWordToLabelBhv extends EsAbstractBehavior OptionalEntity doSelectOptionalEntity(FailureUrlCB cb, - Class tp) { + protected OptionalEntity doSelectOptionalEntity(FailureUrlCB cb, Class tp) { return createOptionalEntity(doSelectEntity(cb, tp), cb); } @@ -172,7 +171,7 @@ public abstract class BsFailureUrlBhv extends EsAbstractBehavior cbLambda, EntityRowHandler> entityLambda) { - delegateSelectBulk(createCB(cbLambda), entityLambda,typeOfSelectedEntity()); + delegateSelectBulk(createCB(cbLambda), entityLambda, typeOfSelectedEntity()); } // =================================================================================== @@ -267,4 +266,3 @@ public abstract class BsFailureUrlBhv extends EsAbstractBehavior cbLambda, EntityRowHandler> entityLambda) { - delegateSelectBulk(createCB(cbLambda), entityLambda,typeOfSelectedEntity()); + delegateSelectBulk(createCB(cbLambda), entityLambda, typeOfSelectedEntity()); } // =================================================================================== @@ -271,4 +271,3 @@ public abstract class BsFileAuthenticationBhv extends EsAbstractBehavior OptionalEntity doSelectOptionalEntity(FileConfigCB cb, - Class tp) { + protected OptionalEntity doSelectOptionalEntity(FileConfigCB cb, Class tp) { return createOptionalEntity(doSelectEntity(cb, tp), cb); } @@ -185,7 +184,7 @@ public abstract class BsFileConfigBhv extends EsAbstractBehavior cbLambda, EntityRowHandler> entityLambda) { - delegateSelectBulk(createCB(cbLambda), entityLambda,typeOfSelectedEntity()); + delegateSelectBulk(createCB(cbLambda), entityLambda, typeOfSelectedEntity()); } // =================================================================================== @@ -280,4 +279,3 @@ public abstract class BsFileConfigBhv extends EsAbstractBehavior cbLambda, EntityRowHandler> entityLambda) { - delegateSelectBulk(createCB(cbLambda), entityLambda,typeOfSelectedEntity()); + delegateSelectBulk(createCB(cbLambda), entityLambda, typeOfSelectedEntity()); } // =================================================================================== @@ -262,4 +262,3 @@ public abstract class BsFileConfigToLabelBhv extends EsAbstractBehavior cbLambda, EntityRowHandler> entityLambda) { - delegateSelectBulk(createCB(cbLambda), entityLambda,typeOfSelectedEntity()); + delegateSelectBulk(createCB(cbLambda), entityLambda, typeOfSelectedEntity()); } // =================================================================================== @@ -262,4 +262,3 @@ public abstract class BsFileConfigToRoleBhv extends EsAbstractBehavior { return doSelectOptionalEntity(cb, typeOfSelectedEntity()); } - protected OptionalEntity doSelectOptionalEntity(JobLogCB cb, - Class tp) { + protected OptionalEntity doSelectOptionalEntity(JobLogCB cb, Class tp) { return createOptionalEntity(doSelectEntity(cb, tp), cb); } @@ -173,7 +172,7 @@ public abstract class BsJobLogBhv extends EsAbstractBehavior { } public void selectBulk(CBCall cbLambda, EntityRowHandler> entityLambda) { - delegateSelectBulk(createCB(cbLambda), entityLambda,typeOfSelectedEntity()); + delegateSelectBulk(createCB(cbLambda), entityLambda, typeOfSelectedEntity()); } // =================================================================================== @@ -268,4 +267,3 @@ public abstract class BsJobLogBhv extends EsAbstractBehavior { // #pending create, modify, remove } - diff --git a/src/main/java/org/codelibs/fess/es/config/bsbhv/BsKeyMatchBhv.java b/src/main/java/org/codelibs/fess/es/config/bsbhv/BsKeyMatchBhv.java index 7e8f33194..e80a7b6fb 100644 --- a/src/main/java/org/codelibs/fess/es/config/bsbhv/BsKeyMatchBhv.java +++ b/src/main/java/org/codelibs/fess/es/config/bsbhv/BsKeyMatchBhv.java @@ -104,8 +104,7 @@ public abstract class BsKeyMatchBhv extends EsAbstractBehavior OptionalEntity doSelectOptionalEntity(KeyMatchCB cb, - Class tp) { + protected OptionalEntity doSelectOptionalEntity(KeyMatchCB cb, Class tp) { return createOptionalEntity(doSelectEntity(cb, tp), cb); } @@ -173,7 +172,7 @@ public abstract class BsKeyMatchBhv extends EsAbstractBehavior cbLambda, EntityRowHandler> entityLambda) { - delegateSelectBulk(createCB(cbLambda), entityLambda,typeOfSelectedEntity()); + delegateSelectBulk(createCB(cbLambda), entityLambda, typeOfSelectedEntity()); } // =================================================================================== @@ -268,4 +267,3 @@ public abstract class BsKeyMatchBhv extends EsAbstractBehavior OptionalEntity doSelectOptionalEntity(LabelToRoleCB cb, - Class tp) { + protected OptionalEntity doSelectOptionalEntity(LabelToRoleCB cb, Class tp) { return createOptionalEntity(doSelectEntity(cb, tp), cb); } @@ -167,7 +166,7 @@ public abstract class BsLabelToRoleBhv extends EsAbstractBehavior cbLambda, EntityRowHandler> entityLambda) { - delegateSelectBulk(createCB(cbLambda), entityLambda,typeOfSelectedEntity()); + delegateSelectBulk(createCB(cbLambda), entityLambda, typeOfSelectedEntity()); } // =================================================================================== @@ -262,4 +261,3 @@ public abstract class BsLabelToRoleBhv extends EsAbstractBehavior OptionalEntity doSelectOptionalEntity(LabelTypeCB cb, - Class tp) { + protected OptionalEntity doSelectOptionalEntity(LabelTypeCB cb, Class tp) { return createOptionalEntity(doSelectEntity(cb, tp), cb); } @@ -175,7 +174,7 @@ public abstract class BsLabelTypeBhv extends EsAbstractBehavior cbLambda, EntityRowHandler> entityLambda) { - delegateSelectBulk(createCB(cbLambda), entityLambda,typeOfSelectedEntity()); + delegateSelectBulk(createCB(cbLambda), entityLambda, typeOfSelectedEntity()); } // =================================================================================== @@ -270,4 +269,3 @@ public abstract class BsLabelTypeBhv extends EsAbstractBehavior OptionalEntity doSelectOptionalEntity(PathMappingCB cb, - Class tp) { + protected OptionalEntity doSelectOptionalEntity(PathMappingCB cb, Class tp) { return createOptionalEntity(doSelectEntity(cb, tp), cb); } @@ -173,7 +172,7 @@ public abstract class BsPathMappingBhv extends EsAbstractBehavior cbLambda, EntityRowHandler> entityLambda) { - delegateSelectBulk(createCB(cbLambda), entityLambda,typeOfSelectedEntity()); + delegateSelectBulk(createCB(cbLambda), entityLambda, typeOfSelectedEntity()); } // =================================================================================== @@ -268,4 +267,3 @@ public abstract class BsPathMappingBhv extends EsAbstractBehavior OptionalEntity doSelectOptionalEntity(RequestHeaderCB cb, - Class tp) { + protected OptionalEntity doSelectOptionalEntity(RequestHeaderCB cb, Class tp) { return createOptionalEntity(doSelectEntity(cb, tp), cb); } @@ -172,7 +171,7 @@ public abstract class BsRequestHeaderBhv extends EsAbstractBehavior cbLambda, EntityRowHandler> entityLambda) { - delegateSelectBulk(createCB(cbLambda), entityLambda,typeOfSelectedEntity()); + delegateSelectBulk(createCB(cbLambda), entityLambda, typeOfSelectedEntity()); } // =================================================================================== @@ -267,4 +266,3 @@ public abstract class BsRequestHeaderBhv extends EsAbstractBehavior OptionalEntity doSelectOptionalEntity(RoleTypeCB cb, - Class tp) { + protected OptionalEntity doSelectOptionalEntity(RoleTypeCB cb, Class tp) { return createOptionalEntity(doSelectEntity(cb, tp), cb); } @@ -172,7 +171,7 @@ public abstract class BsRoleTypeBhv extends EsAbstractBehavior cbLambda, EntityRowHandler> entityLambda) { - delegateSelectBulk(createCB(cbLambda), entityLambda,typeOfSelectedEntity()); + delegateSelectBulk(createCB(cbLambda), entityLambda, typeOfSelectedEntity()); } // =================================================================================== @@ -267,4 +266,3 @@ public abstract class BsRoleTypeBhv extends EsAbstractBehavior OptionalEntity doSelectOptionalEntity(ScheduledJobCB cb, - Class tp) { + protected OptionalEntity doSelectOptionalEntity(ScheduledJobCB cb, Class tp) { return createOptionalEntity(doSelectEntity(cb, tp), cb); } @@ -178,7 +177,7 @@ public abstract class BsScheduledJobBhv extends EsAbstractBehavior cbLambda, EntityRowHandler> entityLambda) { - delegateSelectBulk(createCB(cbLambda), entityLambda,typeOfSelectedEntity()); + delegateSelectBulk(createCB(cbLambda), entityLambda, typeOfSelectedEntity()); } // =================================================================================== @@ -273,4 +272,3 @@ public abstract class BsScheduledJobBhv extends EsAbstractBehavior cbLambda, EntityRowHandler> entityLambda) { - delegateSelectBulk(createCB(cbLambda), entityLambda,typeOfSelectedEntity()); + delegateSelectBulk(createCB(cbLambda), entityLambda, typeOfSelectedEntity()); } // =================================================================================== @@ -272,4 +272,3 @@ public abstract class BsWebAuthenticationBhv extends EsAbstractBehavior OptionalEntity doSelectOptionalEntity(WebConfigCB cb, - Class tp) { + protected OptionalEntity doSelectOptionalEntity(WebConfigCB cb, Class tp) { return createOptionalEntity(doSelectEntity(cb, tp), cb); } @@ -186,7 +185,7 @@ public abstract class BsWebConfigBhv extends EsAbstractBehavior cbLambda, EntityRowHandler> entityLambda) { - delegateSelectBulk(createCB(cbLambda), entityLambda,typeOfSelectedEntity()); + delegateSelectBulk(createCB(cbLambda), entityLambda, typeOfSelectedEntity()); } // =================================================================================== @@ -281,4 +280,3 @@ public abstract class BsWebConfigBhv extends EsAbstractBehavior cbLambda, EntityRowHandler> entityLambda) { - delegateSelectBulk(createCB(cbLambda), entityLambda,typeOfSelectedEntity()); + delegateSelectBulk(createCB(cbLambda), entityLambda, typeOfSelectedEntity()); } // =================================================================================== @@ -262,4 +262,3 @@ public abstract class BsWebConfigToLabelBhv extends EsAbstractBehavior cbLambda, EntityRowHandler> entityLambda) { - delegateSelectBulk(createCB(cbLambda), entityLambda,typeOfSelectedEntity()); + delegateSelectBulk(createCB(cbLambda), entityLambda, typeOfSelectedEntity()); } // =================================================================================== @@ -262,4 +262,3 @@ public abstract class BsWebConfigToRoleBhv extends EsAbstractBehavior _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 @@ -100,32 +106,71 @@ 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); + protected final ColumnInfo _columnCreatedBy = cci("createdBy", "createdBy", null, null, String.class, "createdBy", null, false, false, + false, "String", 0, 0, null, false, null, null, null, null, null, false); + protected final ColumnInfo _columnCreatedTime = cci("createdTime", "createdTime", null, null, Long.class, "createdTime", null, false, + false, false, "Long", 0, 0, null, false, null, null, null, null, null, false); + protected final ColumnInfo _columnSuggestWord = cci("suggestWord", "suggestWord", null, null, String.class, "suggestWord", null, false, + false, false, "String", 0, 0, null, false, null, null, null, null, null, false); + protected final ColumnInfo _columnTargetLabel = cci("targetLabel", "targetLabel", null, null, String.class, "targetLabel", null, false, + false, false, "String", 0, 0, null, false, null, null, null, null, null, false); + protected final ColumnInfo _columnTargetRole = cci("targetRole", "targetRole", null, null, String.class, "targetRole", null, false, + false, false, "String", 0, 0, null, false, null, null, null, null, null, false); + protected final ColumnInfo _columnUpdatedBy = cci("updatedBy", "updatedBy", null, null, String.class, "updatedBy", null, false, false, + false, "String", 0, 0, null, false, null, null, null, null, null, false); + protected final ColumnInfo _columnUpdatedTime = cci("updatedTime", "updatedTime", null, null, Long.class, "updatedTime", null, false, + false, false, "Long", 0, 0, null, false, null, null, null, null, null, false); - public ColumnInfo columnCreatedBy() { return _columnCreatedBy; } - public ColumnInfo columnCreatedTime() { return _columnCreatedTime; } - public ColumnInfo columnSuggestWord() { return _columnSuggestWord; } - public ColumnInfo columnTargetLabel() { return _columnTargetLabel; } - public ColumnInfo columnTargetRole() { return _columnTargetRole; } - public ColumnInfo columnUpdatedBy() { return _columnUpdatedBy; } - public ColumnInfo columnUpdatedTime() { return _columnUpdatedTime; } + public ColumnInfo columnCreatedBy() { + return _columnCreatedBy; + } + + public ColumnInfo columnCreatedTime() { + return _columnCreatedTime; + } + + public ColumnInfo columnSuggestWord() { + return _columnSuggestWord; + } + + public ColumnInfo columnTargetLabel() { + return _columnTargetLabel; + } + + public ColumnInfo columnTargetRole() { + return _columnTargetRole; + } + + public ColumnInfo columnUpdatedBy() { + return _columnUpdatedBy; + } + + public ColumnInfo columnUpdatedTime() { + return _columnUpdatedTime; + } protected List ccil() { List ls = newArrayList(); @@ -212,4 +257,3 @@ public class BadWordDbm extends AbstractDBMeta { return null; } } - diff --git a/src/main/java/org/codelibs/fess/es/config/bsentity/dbmeta/BoostDocumentRuleDbm.java b/src/main/java/org/codelibs/fess/es/config/bsentity/dbmeta/BoostDocumentRuleDbm.java index 6b4353b2b..b993385bd 100644 --- a/src/main/java/org/codelibs/fess/es/config/bsentity/dbmeta/BoostDocumentRuleDbm.java +++ b/src/main/java/org/codelibs/fess/es/config/bsentity/dbmeta/BoostDocumentRuleDbm.java @@ -15,12 +15,11 @@ */ package org.codelibs.fess.es.config.bsentity.dbmeta; -import java.time.*; +import java.time.LocalDateTime; 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; @@ -80,13 +79,20 @@ public class BoostDocumentRuleDbm extends AbstractDBMeta { // --------------- protected final Map _epgMap = newHashMap(); { - setupEpg(_epgMap, et-> ((BoostDocumentRule)et).getBoostExpr(),(et,vl)->((BoostDocumentRule) et).setBoostExpr(DfTypeUtil.toString(vl)), "boostExpr"); - setupEpg(_epgMap, et-> ((BoostDocumentRule)et).getCreatedBy(),(et,vl)->((BoostDocumentRule) et).setCreatedBy(DfTypeUtil.toString(vl)), "createdBy"); - setupEpg(_epgMap, et-> ((BoostDocumentRule)et).getCreatedTime(),(et,vl)->((BoostDocumentRule) et).setCreatedTime(DfTypeUtil.toLong(vl)), "createdTime"); - setupEpg(_epgMap, et-> ((BoostDocumentRule)et).getSortOrder(),(et,vl)->((BoostDocumentRule) et).setSortOrder(DfTypeUtil.toInteger(vl)), "sortOrder"); - setupEpg(_epgMap, et-> ((BoostDocumentRule)et).getUpdatedBy(),(et,vl)->((BoostDocumentRule) et).setUpdatedBy(DfTypeUtil.toString(vl)), "updatedBy"); - setupEpg(_epgMap, et-> ((BoostDocumentRule)et).getUpdatedTime(),(et,vl)->((BoostDocumentRule) et).setUpdatedTime(DfTypeUtil.toLong(vl)), "updatedTime"); - setupEpg(_epgMap, et-> ((BoostDocumentRule)et).getUrlExpr(),(et,vl)->((BoostDocumentRule) et).setUrlExpr(DfTypeUtil.toString(vl)), "urlExpr"); + setupEpg(_epgMap, et -> ((BoostDocumentRule) et).getBoostExpr(), + (et, vl) -> ((BoostDocumentRule) et).setBoostExpr(DfTypeUtil.toString(vl)), "boostExpr"); + setupEpg(_epgMap, et -> ((BoostDocumentRule) et).getCreatedBy(), + (et, vl) -> ((BoostDocumentRule) et).setCreatedBy(DfTypeUtil.toString(vl)), "createdBy"); + setupEpg(_epgMap, et -> ((BoostDocumentRule) et).getCreatedTime(), + (et, vl) -> ((BoostDocumentRule) et).setCreatedTime(DfTypeUtil.toLong(vl)), "createdTime"); + setupEpg(_epgMap, et -> ((BoostDocumentRule) et).getSortOrder(), + (et, vl) -> ((BoostDocumentRule) et).setSortOrder(DfTypeUtil.toInteger(vl)), "sortOrder"); + setupEpg(_epgMap, et -> ((BoostDocumentRule) et).getUpdatedBy(), + (et, vl) -> ((BoostDocumentRule) et).setUpdatedBy(DfTypeUtil.toString(vl)), "updatedBy"); + setupEpg(_epgMap, et -> ((BoostDocumentRule) et).getUpdatedTime(), + (et, vl) -> ((BoostDocumentRule) et).setUpdatedTime(DfTypeUtil.toLong(vl)), "updatedTime"); + setupEpg(_epgMap, et -> ((BoostDocumentRule) et).getUrlExpr(), + (et, vl) -> ((BoostDocumentRule) et).setUrlExpr(DfTypeUtil.toString(vl)), "urlExpr"); } @Override @@ -100,32 +106,71 @@ public class BoostDocumentRuleDbm extends AbstractDBMeta { protected final String _tableDbName = "boost_document_rule"; protected final String _tableDispName = "boost_document_rule"; protected final String _tablePropertyName = "BoostDocumentRule"; - public String getTableDbName() { return _tableDbName; } + + public String getTableDbName() { + return _tableDbName; + } + @Override - public String getTableDispName() { return _tableDispName; } + public String getTableDispName() { + return _tableDispName; + } + @Override - public String getTablePropertyName() { return _tablePropertyName; } + public String getTablePropertyName() { + return _tablePropertyName; + } + @Override - public TableSqlName getTableSqlName() { return null; } + public TableSqlName getTableSqlName() { + return null; + } // =================================================================================== // Column Info // =========== - protected final ColumnInfo _columnBoostExpr = cci("boostExpr", "boostExpr", null, null, String.class, "boostExpr", null, false, false, false, "String", 0, 0, null, false, null, null, null, null, null, false); - protected final ColumnInfo _columnCreatedBy = cci("createdBy", "createdBy", null, null, String.class, "createdBy", null, false, false, false, "String", 0, 0, null, false, null, null, null, null, null, false); - protected final ColumnInfo _columnCreatedTime = cci("createdTime", "createdTime", null, null, Long.class, "createdTime", null, false, false, false, "Long", 0, 0, null, false, null, null, null, null, null, false); - protected final ColumnInfo _columnSortOrder = cci("sortOrder", "sortOrder", null, null, Integer.class, "sortOrder", null, false, false, false, "Integer", 0, 0, null, false, null, null, null, null, null, false); - protected final ColumnInfo _columnUpdatedBy = cci("updatedBy", "updatedBy", null, null, String.class, "updatedBy", null, false, false, false, "String", 0, 0, null, false, null, null, null, null, null, false); - protected final ColumnInfo _columnUpdatedTime = cci("updatedTime", "updatedTime", null, null, Long.class, "updatedTime", null, false, false, false, "Long", 0, 0, null, false, null, null, null, null, null, false); - protected final ColumnInfo _columnUrlExpr = cci("urlExpr", "urlExpr", null, null, String.class, "urlExpr", null, false, false, false, "String", 0, 0, null, false, null, null, null, null, null, false); + protected final ColumnInfo _columnBoostExpr = cci("boostExpr", "boostExpr", null, null, String.class, "boostExpr", null, false, false, + false, "String", 0, 0, null, false, null, null, null, null, null, false); + protected final ColumnInfo _columnCreatedBy = cci("createdBy", "createdBy", null, null, String.class, "createdBy", null, false, false, + false, "String", 0, 0, null, false, null, null, null, null, null, false); + protected final ColumnInfo _columnCreatedTime = cci("createdTime", "createdTime", null, null, Long.class, "createdTime", null, false, + false, false, "Long", 0, 0, null, false, null, null, null, null, null, false); + protected final ColumnInfo _columnSortOrder = cci("sortOrder", "sortOrder", null, null, Integer.class, "sortOrder", null, false, false, + false, "Integer", 0, 0, null, false, null, null, null, null, null, false); + protected final ColumnInfo _columnUpdatedBy = cci("updatedBy", "updatedBy", null, null, String.class, "updatedBy", null, false, false, + false, "String", 0, 0, null, false, null, null, null, null, null, false); + protected final ColumnInfo _columnUpdatedTime = cci("updatedTime", "updatedTime", null, null, Long.class, "updatedTime", null, false, + false, false, "Long", 0, 0, null, false, null, null, null, null, null, false); + protected final ColumnInfo _columnUrlExpr = cci("urlExpr", "urlExpr", null, null, String.class, "urlExpr", null, false, false, false, + "String", 0, 0, null, false, null, null, null, null, null, false); - public ColumnInfo columnBoostExpr() { return _columnBoostExpr; } - public ColumnInfo columnCreatedBy() { return _columnCreatedBy; } - public ColumnInfo columnCreatedTime() { return _columnCreatedTime; } - public ColumnInfo columnSortOrder() { return _columnSortOrder; } - public ColumnInfo columnUpdatedBy() { return _columnUpdatedBy; } - public ColumnInfo columnUpdatedTime() { return _columnUpdatedTime; } - public ColumnInfo columnUrlExpr() { return _columnUrlExpr; } + public ColumnInfo columnBoostExpr() { + return _columnBoostExpr; + } + + public ColumnInfo columnCreatedBy() { + return _columnCreatedBy; + } + + public ColumnInfo columnCreatedTime() { + return _columnCreatedTime; + } + + public ColumnInfo columnSortOrder() { + return _columnSortOrder; + } + + public ColumnInfo columnUpdatedBy() { + return _columnUpdatedBy; + } + + public ColumnInfo columnUpdatedTime() { + return _columnUpdatedTime; + } + + public ColumnInfo columnUrlExpr() { + return _columnUrlExpr; + } protected List ccil() { List ls = newArrayList(); @@ -212,4 +257,3 @@ public class BoostDocumentRuleDbm extends AbstractDBMeta { return null; } } - diff --git a/src/main/java/org/codelibs/fess/es/config/bsentity/dbmeta/CrawlingInfoDbm.java b/src/main/java/org/codelibs/fess/es/config/bsentity/dbmeta/CrawlingInfoDbm.java index d30916d3a..1ae7926c6 100644 --- a/src/main/java/org/codelibs/fess/es/config/bsentity/dbmeta/CrawlingInfoDbm.java +++ b/src/main/java/org/codelibs/fess/es/config/bsentity/dbmeta/CrawlingInfoDbm.java @@ -15,12 +15,11 @@ */ package org.codelibs.fess.es.config.bsentity.dbmeta; -import java.time.*; +import java.time.LocalDateTime; 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; @@ -80,10 +79,13 @@ public class CrawlingInfoDbm extends AbstractDBMeta { // --------------- protected final Map _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 @@ -97,26 +99,53 @@ 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 ccil() { List ls = newArrayList(); @@ -200,4 +229,3 @@ public class CrawlingInfoDbm extends AbstractDBMeta { return null; } } - diff --git a/src/main/java/org/codelibs/fess/es/config/bsentity/dbmeta/CrawlingInfoParamDbm.java b/src/main/java/org/codelibs/fess/es/config/bsentity/dbmeta/CrawlingInfoParamDbm.java index 56dfa6c1b..6c1390280 100644 --- a/src/main/java/org/codelibs/fess/es/config/bsentity/dbmeta/CrawlingInfoParamDbm.java +++ b/src/main/java/org/codelibs/fess/es/config/bsentity/dbmeta/CrawlingInfoParamDbm.java @@ -15,12 +15,11 @@ */ package org.codelibs.fess.es.config.bsentity.dbmeta; -import java.time.*; +import java.time.LocalDateTime; 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; @@ -80,10 +79,14 @@ public class CrawlingInfoParamDbm extends AbstractDBMeta { // --------------- protected final Map _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 @@ -97,26 +100,53 @@ 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 ccil() { List ls = newArrayList(); @@ -200,4 +230,3 @@ public class CrawlingInfoParamDbm extends AbstractDBMeta { return null; } } - diff --git a/src/main/java/org/codelibs/fess/es/config/bsentity/dbmeta/DataConfigDbm.java b/src/main/java/org/codelibs/fess/es/config/bsentity/dbmeta/DataConfigDbm.java index 866a86313..4bbaf1212 100644 --- a/src/main/java/org/codelibs/fess/es/config/bsentity/dbmeta/DataConfigDbm.java +++ b/src/main/java/org/codelibs/fess/es/config/bsentity/dbmeta/DataConfigDbm.java @@ -15,12 +15,11 @@ */ package org.codelibs.fess.es.config.bsentity.dbmeta; -import java.time.*; +import java.time.LocalDateTime; 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; @@ -80,18 +79,28 @@ public class DataConfigDbm extends AbstractDBMeta { // --------------- protected final Map _epgMap = newHashMap(); { - setupEpg(_epgMap, et-> ((DataConfig)et).getAvailable(),(et,vl)->((DataConfig) et).setAvailable(DfTypeUtil.toBoolean(vl)), "available"); - setupEpg(_epgMap, et-> ((DataConfig)et).getBoost(),(et,vl)->((DataConfig) et).setBoost(DfTypeUtil.toFloat(vl)), "boost"); - setupEpg(_epgMap, et-> ((DataConfig)et).getCreatedBy(),(et,vl)->((DataConfig) et).setCreatedBy(DfTypeUtil.toString(vl)), "createdBy"); - setupEpg(_epgMap, et-> ((DataConfig)et).getCreatedTime(),(et,vl)->((DataConfig) et).setCreatedTime(DfTypeUtil.toLong(vl)), "createdTime"); - setupEpg(_epgMap, et-> ((DataConfig)et).getHandlerName(),(et,vl)->((DataConfig) et).setHandlerName(DfTypeUtil.toString(vl)), "handlerName"); - setupEpg(_epgMap, et-> ((DataConfig)et).getHandlerParameter(),(et,vl)->((DataConfig) et).setHandlerParameter(DfTypeUtil.toString(vl)), "handlerParameter"); - setupEpg(_epgMap, et-> ((DataConfig)et).getHandlerScript(),(et,vl)->((DataConfig) et).setHandlerScript(DfTypeUtil.toString(vl)), "handlerScript"); - setupEpg(_epgMap, et-> ((DataConfig)et).getName(),(et,vl)->((DataConfig) et).setName(DfTypeUtil.toString(vl)), "name"); - setupEpg(_epgMap, et-> ((DataConfig)et).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 @@ -105,42 +114,101 @@ 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); + 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; } + 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 ccil() { List ls = newArrayList(); @@ -232,4 +300,3 @@ public class DataConfigDbm extends AbstractDBMeta { return null; } } - diff --git a/src/main/java/org/codelibs/fess/es/config/bsentity/dbmeta/DataConfigToLabelDbm.java b/src/main/java/org/codelibs/fess/es/config/bsentity/dbmeta/DataConfigToLabelDbm.java index 49f8b6d9c..0c26ae1d7 100644 --- a/src/main/java/org/codelibs/fess/es/config/bsentity/dbmeta/DataConfigToLabelDbm.java +++ b/src/main/java/org/codelibs/fess/es/config/bsentity/dbmeta/DataConfigToLabelDbm.java @@ -15,12 +15,11 @@ */ package org.codelibs.fess.es.config.bsentity.dbmeta; -import java.time.*; +import java.time.LocalDateTime; 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; @@ -80,8 +79,10 @@ public class DataConfigToLabelDbm extends AbstractDBMeta { // --------------- protected final Map _epgMap = newHashMap(); { - setupEpg(_epgMap, et-> ((DataConfigToLabel)et).getDataConfigId(),(et,vl)->((DataConfigToLabel) et).setDataConfigId(DfTypeUtil.toString(vl)), "dataConfigId"); - setupEpg(_epgMap, et-> ((DataConfigToLabel)et).getLabelTypeId(),(et,vl)->((DataConfigToLabel) et).setLabelTypeId(DfTypeUtil.toString(vl)), "labelTypeId"); + setupEpg(_epgMap, et -> ((DataConfigToLabel) et).getDataConfigId(), + (et, vl) -> ((DataConfigToLabel) et).setDataConfigId(DfTypeUtil.toString(vl)), "dataConfigId"); + setupEpg(_epgMap, et -> ((DataConfigToLabel) et).getLabelTypeId(), + (et, vl) -> ((DataConfigToLabel) et).setLabelTypeId(DfTypeUtil.toString(vl)), "labelTypeId"); } @Override @@ -95,22 +96,41 @@ public class DataConfigToLabelDbm extends AbstractDBMeta { protected final String _tableDbName = "data_config_to_label"; protected final String _tableDispName = "data_config_to_label"; protected final String _tablePropertyName = "DataConfigToLabel"; - public String getTableDbName() { return _tableDbName; } + + public String getTableDbName() { + return _tableDbName; + } + @Override - public String getTableDispName() { return _tableDispName; } + public String getTableDispName() { + return _tableDispName; + } + @Override - public String getTablePropertyName() { return _tablePropertyName; } + public String getTablePropertyName() { + return _tablePropertyName; + } + @Override - public TableSqlName getTableSqlName() { return null; } + public TableSqlName getTableSqlName() { + return null; + } // =================================================================================== // Column Info // =========== - protected final ColumnInfo _columnDataConfigId = cci("dataConfigId", "dataConfigId", null, null, String.class, "dataConfigId", null, false, false, false, "String", 0, 0, null, false, null, null, null, null, null, false); - protected final ColumnInfo _columnLabelTypeId = cci("labelTypeId", "labelTypeId", null, null, String.class, "labelTypeId", null, false, false, false, "String", 0, 0, null, false, null, null, null, null, null, false); + protected final ColumnInfo _columnDataConfigId = cci("dataConfigId", "dataConfigId", null, null, String.class, "dataConfigId", null, + false, false, false, "String", 0, 0, null, false, null, null, null, null, null, false); + protected final ColumnInfo _columnLabelTypeId = cci("labelTypeId", "labelTypeId", null, null, String.class, "labelTypeId", null, false, + false, false, "String", 0, 0, null, false, null, null, null, null, null, false); - public ColumnInfo columnDataConfigId() { return _columnDataConfigId; } - public ColumnInfo columnLabelTypeId() { return _columnLabelTypeId; } + public ColumnInfo columnDataConfigId() { + return _columnDataConfigId; + } + + public ColumnInfo columnLabelTypeId() { + return _columnLabelTypeId; + } protected List ccil() { List ls = newArrayList(); @@ -192,4 +212,3 @@ public class DataConfigToLabelDbm extends AbstractDBMeta { return null; } } - diff --git a/src/main/java/org/codelibs/fess/es/config/bsentity/dbmeta/DataConfigToRoleDbm.java b/src/main/java/org/codelibs/fess/es/config/bsentity/dbmeta/DataConfigToRoleDbm.java index 1e17d502a..89ed4571b 100644 --- a/src/main/java/org/codelibs/fess/es/config/bsentity/dbmeta/DataConfigToRoleDbm.java +++ b/src/main/java/org/codelibs/fess/es/config/bsentity/dbmeta/DataConfigToRoleDbm.java @@ -15,12 +15,11 @@ */ package org.codelibs.fess.es.config.bsentity.dbmeta; -import java.time.*; +import java.time.LocalDateTime; 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; @@ -80,8 +79,10 @@ public class DataConfigToRoleDbm extends AbstractDBMeta { // --------------- protected final Map _epgMap = newHashMap(); { - setupEpg(_epgMap, et-> ((DataConfigToRole)et).getDataConfigId(),(et,vl)->((DataConfigToRole) et).setDataConfigId(DfTypeUtil.toString(vl)), "dataConfigId"); - setupEpg(_epgMap, et-> ((DataConfigToRole)et).getRoleTypeId(),(et,vl)->((DataConfigToRole) et).setRoleTypeId(DfTypeUtil.toString(vl)), "roleTypeId"); + setupEpg(_epgMap, et -> ((DataConfigToRole) et).getDataConfigId(), + (et, vl) -> ((DataConfigToRole) et).setDataConfigId(DfTypeUtil.toString(vl)), "dataConfigId"); + setupEpg(_epgMap, et -> ((DataConfigToRole) et).getRoleTypeId(), + (et, vl) -> ((DataConfigToRole) et).setRoleTypeId(DfTypeUtil.toString(vl)), "roleTypeId"); } @Override @@ -95,22 +96,41 @@ public class DataConfigToRoleDbm extends AbstractDBMeta { protected final String _tableDbName = "data_config_to_role"; protected final String _tableDispName = "data_config_to_role"; protected final String _tablePropertyName = "DataConfigToRole"; - public String getTableDbName() { return _tableDbName; } + + public String getTableDbName() { + return _tableDbName; + } + @Override - public String getTableDispName() { return _tableDispName; } + public String getTableDispName() { + return _tableDispName; + } + @Override - public String getTablePropertyName() { return _tablePropertyName; } + public String getTablePropertyName() { + return _tablePropertyName; + } + @Override - public TableSqlName getTableSqlName() { return null; } + public TableSqlName getTableSqlName() { + return null; + } // =================================================================================== // Column Info // =========== - protected final ColumnInfo _columnDataConfigId = cci("dataConfigId", "dataConfigId", null, null, String.class, "dataConfigId", null, false, false, false, "String", 0, 0, null, false, null, null, null, null, null, false); - protected final ColumnInfo _columnRoleTypeId = cci("roleTypeId", "roleTypeId", null, null, String.class, "roleTypeId", null, false, false, false, "String", 0, 0, null, false, null, null, null, null, null, false); + protected final ColumnInfo _columnDataConfigId = cci("dataConfigId", "dataConfigId", null, null, String.class, "dataConfigId", null, + false, false, false, "String", 0, 0, null, false, null, null, null, null, null, false); + protected final ColumnInfo _columnRoleTypeId = cci("roleTypeId", "roleTypeId", null, null, String.class, "roleTypeId", null, false, + false, false, "String", 0, 0, null, false, null, null, null, null, null, false); - public ColumnInfo columnDataConfigId() { return _columnDataConfigId; } - public ColumnInfo columnRoleTypeId() { return _columnRoleTypeId; } + public ColumnInfo columnDataConfigId() { + return _columnDataConfigId; + } + + public ColumnInfo columnRoleTypeId() { + return _columnRoleTypeId; + } protected List ccil() { List ls = newArrayList(); @@ -192,4 +212,3 @@ public class DataConfigToRoleDbm extends AbstractDBMeta { return null; } } - diff --git a/src/main/java/org/codelibs/fess/es/config/bsentity/dbmeta/DuplicateHostDbm.java b/src/main/java/org/codelibs/fess/es/config/bsentity/dbmeta/DuplicateHostDbm.java index 92b9ea638..4f7c24cec 100644 --- a/src/main/java/org/codelibs/fess/es/config/bsentity/dbmeta/DuplicateHostDbm.java +++ b/src/main/java/org/codelibs/fess/es/config/bsentity/dbmeta/DuplicateHostDbm.java @@ -15,12 +15,11 @@ */ package org.codelibs.fess.es.config.bsentity.dbmeta; -import java.time.*; +import java.time.LocalDateTime; 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; @@ -80,13 +79,20 @@ public class DuplicateHostDbm extends AbstractDBMeta { // --------------- protected final Map _epgMap = newHashMap(); { - setupEpg(_epgMap, et-> ((DuplicateHost)et).getCreatedBy(),(et,vl)->((DuplicateHost) et).setCreatedBy(DfTypeUtil.toString(vl)), "createdBy"); - setupEpg(_epgMap, et-> ((DuplicateHost)et).getCreatedTime(),(et,vl)->((DuplicateHost) et).setCreatedTime(DfTypeUtil.toLong(vl)), "createdTime"); - setupEpg(_epgMap, et-> ((DuplicateHost)et).getDuplicateHostName(),(et,vl)->((DuplicateHost) et).setDuplicateHostName(DfTypeUtil.toString(vl)), "duplicateHostName"); - setupEpg(_epgMap, et-> ((DuplicateHost)et).getRegularName(),(et,vl)->((DuplicateHost) et).setRegularName(DfTypeUtil.toString(vl)), "regularName"); - setupEpg(_epgMap, et-> ((DuplicateHost)et).getSortOrder(),(et,vl)->((DuplicateHost) et).setSortOrder(DfTypeUtil.toInteger(vl)), "sortOrder"); - setupEpg(_epgMap, et-> ((DuplicateHost)et).getUpdatedBy(),(et,vl)->((DuplicateHost) et).setUpdatedBy(DfTypeUtil.toString(vl)), "updatedBy"); - setupEpg(_epgMap, et-> ((DuplicateHost)et).getUpdatedTime(),(et,vl)->((DuplicateHost) et).setUpdatedTime(DfTypeUtil.toLong(vl)), "updatedTime"); + setupEpg(_epgMap, et -> ((DuplicateHost) et).getCreatedBy(), + (et, vl) -> ((DuplicateHost) et).setCreatedBy(DfTypeUtil.toString(vl)), "createdBy"); + setupEpg(_epgMap, et -> ((DuplicateHost) et).getCreatedTime(), + (et, vl) -> ((DuplicateHost) et).setCreatedTime(DfTypeUtil.toLong(vl)), "createdTime"); + setupEpg(_epgMap, et -> ((DuplicateHost) et).getDuplicateHostName(), + (et, vl) -> ((DuplicateHost) et).setDuplicateHostName(DfTypeUtil.toString(vl)), "duplicateHostName"); + setupEpg(_epgMap, et -> ((DuplicateHost) et).getRegularName(), + (et, vl) -> ((DuplicateHost) et).setRegularName(DfTypeUtil.toString(vl)), "regularName"); + setupEpg(_epgMap, et -> ((DuplicateHost) et).getSortOrder(), + (et, vl) -> ((DuplicateHost) et).setSortOrder(DfTypeUtil.toInteger(vl)), "sortOrder"); + setupEpg(_epgMap, et -> ((DuplicateHost) et).getUpdatedBy(), + (et, vl) -> ((DuplicateHost) et).setUpdatedBy(DfTypeUtil.toString(vl)), "updatedBy"); + setupEpg(_epgMap, et -> ((DuplicateHost) et).getUpdatedTime(), + (et, vl) -> ((DuplicateHost) et).setUpdatedTime(DfTypeUtil.toLong(vl)), "updatedTime"); } @Override @@ -100,32 +106,71 @@ public class DuplicateHostDbm extends AbstractDBMeta { protected final String _tableDbName = "duplicate_host"; protected final String _tableDispName = "duplicate_host"; protected final String _tablePropertyName = "DuplicateHost"; - public String getTableDbName() { return _tableDbName; } + + public String getTableDbName() { + return _tableDbName; + } + @Override - public String getTableDispName() { return _tableDispName; } + public String getTableDispName() { + return _tableDispName; + } + @Override - public String getTablePropertyName() { return _tablePropertyName; } + public String getTablePropertyName() { + return _tablePropertyName; + } + @Override - public TableSqlName getTableSqlName() { return null; } + public TableSqlName getTableSqlName() { + return null; + } // =================================================================================== // Column Info // =========== - protected final ColumnInfo _columnCreatedBy = cci("createdBy", "createdBy", null, null, String.class, "createdBy", null, false, false, false, "String", 0, 0, null, false, null, null, null, null, null, false); - protected final ColumnInfo _columnCreatedTime = cci("createdTime", "createdTime", null, null, Long.class, "createdTime", null, false, false, false, "Long", 0, 0, null, false, null, null, null, null, null, false); - protected final ColumnInfo _columnDuplicateHostName = cci("duplicateHostName", "duplicateHostName", null, null, String.class, "duplicateHostName", null, false, false, false, "String", 0, 0, null, false, null, null, null, null, null, false); - protected final ColumnInfo _columnRegularName = cci("regularName", "regularName", null, null, String.class, "regularName", null, false, false, false, "String", 0, 0, null, false, null, null, null, null, null, false); - protected final ColumnInfo _columnSortOrder = cci("sortOrder", "sortOrder", null, null, Integer.class, "sortOrder", null, false, false, false, "Integer", 0, 0, null, false, null, null, null, null, null, false); - protected final ColumnInfo _columnUpdatedBy = cci("updatedBy", "updatedBy", null, null, String.class, "updatedBy", null, false, false, false, "String", 0, 0, null, false, null, null, null, null, null, false); - protected final ColumnInfo _columnUpdatedTime = cci("updatedTime", "updatedTime", null, null, Long.class, "updatedTime", null, false, false, false, "Long", 0, 0, null, false, null, null, null, null, null, false); + protected final ColumnInfo _columnCreatedBy = cci("createdBy", "createdBy", null, null, String.class, "createdBy", null, false, false, + false, "String", 0, 0, null, false, null, null, null, null, null, false); + protected final ColumnInfo _columnCreatedTime = cci("createdTime", "createdTime", null, null, Long.class, "createdTime", null, false, + false, false, "Long", 0, 0, null, false, null, null, null, null, null, false); + protected final ColumnInfo _columnDuplicateHostName = cci("duplicateHostName", "duplicateHostName", null, null, String.class, + "duplicateHostName", null, false, false, false, "String", 0, 0, null, false, null, null, null, null, null, false); + protected final ColumnInfo _columnRegularName = cci("regularName", "regularName", null, null, String.class, "regularName", null, false, + false, false, "String", 0, 0, null, false, null, null, null, null, null, false); + protected final ColumnInfo _columnSortOrder = cci("sortOrder", "sortOrder", null, null, Integer.class, "sortOrder", null, false, false, + false, "Integer", 0, 0, null, false, null, null, null, null, null, false); + protected final ColumnInfo _columnUpdatedBy = cci("updatedBy", "updatedBy", null, null, String.class, "updatedBy", null, false, false, + false, "String", 0, 0, null, false, null, null, null, null, null, false); + protected final ColumnInfo _columnUpdatedTime = cci("updatedTime", "updatedTime", null, null, Long.class, "updatedTime", null, false, + false, false, "Long", 0, 0, null, false, null, null, null, null, null, false); - public ColumnInfo columnCreatedBy() { return _columnCreatedBy; } - public ColumnInfo columnCreatedTime() { return _columnCreatedTime; } - public ColumnInfo columnDuplicateHostName() { return _columnDuplicateHostName; } - public ColumnInfo columnRegularName() { return _columnRegularName; } - public ColumnInfo columnSortOrder() { return _columnSortOrder; } - public ColumnInfo columnUpdatedBy() { return _columnUpdatedBy; } - public ColumnInfo columnUpdatedTime() { return _columnUpdatedTime; } + public ColumnInfo columnCreatedBy() { + return _columnCreatedBy; + } + + public ColumnInfo columnCreatedTime() { + return _columnCreatedTime; + } + + public ColumnInfo columnDuplicateHostName() { + return _columnDuplicateHostName; + } + + public ColumnInfo columnRegularName() { + return _columnRegularName; + } + + public ColumnInfo columnSortOrder() { + return _columnSortOrder; + } + + public ColumnInfo columnUpdatedBy() { + return _columnUpdatedBy; + } + + public ColumnInfo columnUpdatedTime() { + return _columnUpdatedTime; + } protected List ccil() { List ls = newArrayList(); @@ -212,4 +257,3 @@ public class DuplicateHostDbm extends AbstractDBMeta { return null; } } - diff --git a/src/main/java/org/codelibs/fess/es/config/bsentity/dbmeta/ElevateWordDbm.java b/src/main/java/org/codelibs/fess/es/config/bsentity/dbmeta/ElevateWordDbm.java index 71b01f437..b27fa26b0 100644 --- a/src/main/java/org/codelibs/fess/es/config/bsentity/dbmeta/ElevateWordDbm.java +++ b/src/main/java/org/codelibs/fess/es/config/bsentity/dbmeta/ElevateWordDbm.java @@ -15,12 +15,11 @@ */ package org.codelibs.fess.es.config.bsentity.dbmeta; -import java.time.*; +import java.time.LocalDateTime; 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; @@ -80,15 +79,23 @@ public class ElevateWordDbm extends AbstractDBMeta { // --------------- protected final Map _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 @@ -102,36 +109,83 @@ 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); + protected final ColumnInfo _columnBoost = cci("boost", "boost", null, null, Float.class, "boost", null, false, false, false, "Float", + 0, 0, null, false, null, null, null, null, null, false); + protected final ColumnInfo _columnCreatedBy = cci("createdBy", "createdBy", null, null, String.class, "createdBy", null, false, false, + false, "String", 0, 0, null, false, null, null, null, null, null, false); + protected final ColumnInfo _columnCreatedTime = cci("createdTime", "createdTime", null, null, Long.class, "createdTime", null, false, + false, false, "Long", 0, 0, null, false, null, null, null, null, null, false); + protected final ColumnInfo _columnReading = cci("reading", "reading", null, null, String.class, "reading", null, false, false, false, + "String", 0, 0, null, false, null, null, null, null, null, false); + protected final ColumnInfo _columnSuggestWord = cci("suggestWord", "suggestWord", null, null, String.class, "suggestWord", null, false, + false, false, "String", 0, 0, null, false, null, null, null, null, null, false); + protected final ColumnInfo _columnTargetLabel = cci("targetLabel", "targetLabel", null, null, String.class, "targetLabel", null, false, + false, false, "String", 0, 0, null, false, null, null, null, null, null, false); + protected final ColumnInfo _columnTargetRole = cci("targetRole", "targetRole", null, null, String.class, "targetRole", null, false, + false, false, "String", 0, 0, null, false, null, null, null, null, null, false); + protected final ColumnInfo _columnUpdatedBy = cci("updatedBy", "updatedBy", null, null, String.class, "updatedBy", null, false, false, + false, "String", 0, 0, null, false, null, null, null, null, null, false); + protected final ColumnInfo _columnUpdatedTime = cci("updatedTime", "updatedTime", null, null, Long.class, "updatedTime", null, false, + false, false, "Long", 0, 0, null, false, null, null, null, null, null, false); - public ColumnInfo columnBoost() { return _columnBoost; } - public ColumnInfo columnCreatedBy() { return _columnCreatedBy; } - public ColumnInfo columnCreatedTime() { return _columnCreatedTime; } - public ColumnInfo columnReading() { return _columnReading; } - public ColumnInfo columnSuggestWord() { return _columnSuggestWord; } - public ColumnInfo columnTargetLabel() { return _columnTargetLabel; } - public ColumnInfo columnTargetRole() { return _columnTargetRole; } - public ColumnInfo columnUpdatedBy() { return _columnUpdatedBy; } - public ColumnInfo columnUpdatedTime() { return _columnUpdatedTime; } + public ColumnInfo columnBoost() { + return _columnBoost; + } + + public ColumnInfo columnCreatedBy() { + return _columnCreatedBy; + } + + public ColumnInfo columnCreatedTime() { + return _columnCreatedTime; + } + + public ColumnInfo columnReading() { + return _columnReading; + } + + public ColumnInfo columnSuggestWord() { + return _columnSuggestWord; + } + + public ColumnInfo columnTargetLabel() { + return _columnTargetLabel; + } + + public ColumnInfo columnTargetRole() { + return _columnTargetRole; + } + + public ColumnInfo columnUpdatedBy() { + return _columnUpdatedBy; + } + + public ColumnInfo columnUpdatedTime() { + return _columnUpdatedTime; + } protected List ccil() { List ls = newArrayList(); @@ -220,4 +274,3 @@ public class ElevateWordDbm extends AbstractDBMeta { return null; } } - diff --git a/src/main/java/org/codelibs/fess/es/config/bsentity/dbmeta/ElevateWordToLabelDbm.java b/src/main/java/org/codelibs/fess/es/config/bsentity/dbmeta/ElevateWordToLabelDbm.java index bbcf9f78e..86212f725 100644 --- a/src/main/java/org/codelibs/fess/es/config/bsentity/dbmeta/ElevateWordToLabelDbm.java +++ b/src/main/java/org/codelibs/fess/es/config/bsentity/dbmeta/ElevateWordToLabelDbm.java @@ -15,12 +15,11 @@ */ package org.codelibs.fess.es.config.bsentity.dbmeta; -import java.time.*; +import java.time.LocalDateTime; 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; @@ -80,8 +79,10 @@ public class ElevateWordToLabelDbm extends AbstractDBMeta { // --------------- protected final Map _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 @@ -95,22 +96,41 @@ 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 ccil() { List ls = newArrayList(); @@ -192,4 +212,3 @@ public class ElevateWordToLabelDbm extends AbstractDBMeta { return null; } } - diff --git a/src/main/java/org/codelibs/fess/es/config/bsentity/dbmeta/FailureUrlDbm.java b/src/main/java/org/codelibs/fess/es/config/bsentity/dbmeta/FailureUrlDbm.java index f14d19a4c..7bd7eef21 100644 --- a/src/main/java/org/codelibs/fess/es/config/bsentity/dbmeta/FailureUrlDbm.java +++ b/src/main/java/org/codelibs/fess/es/config/bsentity/dbmeta/FailureUrlDbm.java @@ -15,12 +15,11 @@ */ package org.codelibs.fess.es.config.bsentity.dbmeta; -import java.time.*; +import java.time.LocalDateTime; 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; @@ -80,13 +79,19 @@ public class FailureUrlDbm extends AbstractDBMeta { // --------------- protected final Map _epgMap = newHashMap(); { - setupEpg(_epgMap, et-> ((FailureUrl)et).getConfigId(),(et,vl)->((FailureUrl) et).setConfigId(DfTypeUtil.toString(vl)), "configId"); - setupEpg(_epgMap, et-> ((FailureUrl)et).getErrorCount(),(et,vl)->((FailureUrl) et).setErrorCount(DfTypeUtil.toInteger(vl)), "errorCount"); - setupEpg(_epgMap, et-> ((FailureUrl)et).getErrorLog(),(et,vl)->((FailureUrl) et).setErrorLog(DfTypeUtil.toString(vl)), "errorLog"); - setupEpg(_epgMap, et-> ((FailureUrl)et).getErrorName(),(et,vl)->((FailureUrl) et).setErrorName(DfTypeUtil.toString(vl)), "errorName"); - setupEpg(_epgMap, et-> ((FailureUrl)et).getLastAccessTime(),(et,vl)->((FailureUrl) et).setLastAccessTime(DfTypeUtil.toLong(vl)), "lastAccessTime"); - setupEpg(_epgMap, et-> ((FailureUrl)et).getThreadName(),(et,vl)->((FailureUrl) et).setThreadName(DfTypeUtil.toString(vl)), "threadName"); - setupEpg(_epgMap, et-> ((FailureUrl)et).getUrl(),(et,vl)->((FailureUrl) et).setUrl(DfTypeUtil.toString(vl)), "url"); + setupEpg(_epgMap, et -> ((FailureUrl) et).getConfigId(), (et, vl) -> ((FailureUrl) et).setConfigId(DfTypeUtil.toString(vl)), + "configId"); + setupEpg(_epgMap, et -> ((FailureUrl) et).getErrorCount(), (et, vl) -> ((FailureUrl) et).setErrorCount(DfTypeUtil.toInteger(vl)), + "errorCount"); + setupEpg(_epgMap, et -> ((FailureUrl) et).getErrorLog(), (et, vl) -> ((FailureUrl) et).setErrorLog(DfTypeUtil.toString(vl)), + "errorLog"); + setupEpg(_epgMap, et -> ((FailureUrl) et).getErrorName(), (et, vl) -> ((FailureUrl) et).setErrorName(DfTypeUtil.toString(vl)), + "errorName"); + setupEpg(_epgMap, et -> ((FailureUrl) et).getLastAccessTime(), + (et, vl) -> ((FailureUrl) et).setLastAccessTime(DfTypeUtil.toLong(vl)), "lastAccessTime"); + setupEpg(_epgMap, et -> ((FailureUrl) et).getThreadName(), (et, vl) -> ((FailureUrl) et).setThreadName(DfTypeUtil.toString(vl)), + "threadName"); + setupEpg(_epgMap, et -> ((FailureUrl) et).getUrl(), (et, vl) -> ((FailureUrl) et).setUrl(DfTypeUtil.toString(vl)), "url"); } @Override @@ -100,32 +105,71 @@ public class FailureUrlDbm extends AbstractDBMeta { protected final String _tableDbName = "failure_url"; protected final String _tableDispName = "failure_url"; protected final String _tablePropertyName = "FailureUrl"; - public String getTableDbName() { return _tableDbName; } + + public String getTableDbName() { + return _tableDbName; + } + @Override - public String getTableDispName() { return _tableDispName; } + public String getTableDispName() { + return _tableDispName; + } + @Override - public String getTablePropertyName() { return _tablePropertyName; } + public String getTablePropertyName() { + return _tablePropertyName; + } + @Override - public TableSqlName getTableSqlName() { return null; } + public TableSqlName getTableSqlName() { + return null; + } // =================================================================================== // Column Info // =========== - protected final ColumnInfo _columnConfigId = cci("configId", "configId", null, null, String.class, "configId", null, false, false, false, "String", 0, 0, null, false, null, null, null, null, null, false); - protected final ColumnInfo _columnErrorCount = cci("errorCount", "errorCount", null, null, Integer.class, "errorCount", null, false, false, false, "Integer", 0, 0, null, false, null, null, null, null, null, false); - protected final ColumnInfo _columnErrorLog = cci("errorLog", "errorLog", null, null, String.class, "errorLog", null, false, false, false, "String", 0, 0, null, false, null, null, null, null, null, false); - protected final ColumnInfo _columnErrorName = cci("errorName", "errorName", null, null, String.class, "errorName", null, false, false, false, "String", 0, 0, null, false, null, null, null, null, null, false); - protected final ColumnInfo _columnLastAccessTime = cci("lastAccessTime", "lastAccessTime", null, null, Long.class, "lastAccessTime", null, false, false, false, "Long", 0, 0, null, false, null, null, null, null, null, false); - protected final ColumnInfo _columnThreadName = cci("threadName", "threadName", null, null, String.class, "threadName", null, false, false, false, "String", 0, 0, null, false, null, null, null, null, null, false); - protected final ColumnInfo _columnUrl = cci("url", "url", null, null, String.class, "url", null, false, false, false, "String", 0, 0, null, false, null, null, null, null, null, false); + protected final ColumnInfo _columnConfigId = cci("configId", "configId", null, null, String.class, "configId", null, false, false, + false, "String", 0, 0, null, false, null, null, null, null, null, false); + protected final ColumnInfo _columnErrorCount = cci("errorCount", "errorCount", null, null, Integer.class, "errorCount", null, false, + false, false, "Integer", 0, 0, null, false, null, null, null, null, null, false); + protected final ColumnInfo _columnErrorLog = cci("errorLog", "errorLog", null, null, String.class, "errorLog", null, false, false, + false, "String", 0, 0, null, false, null, null, null, null, null, false); + protected final ColumnInfo _columnErrorName = cci("errorName", "errorName", null, null, String.class, "errorName", null, false, false, + false, "String", 0, 0, null, false, null, null, null, null, null, false); + protected final ColumnInfo _columnLastAccessTime = cci("lastAccessTime", "lastAccessTime", null, null, Long.class, "lastAccessTime", + null, false, false, false, "Long", 0, 0, null, false, null, null, null, null, null, false); + protected final ColumnInfo _columnThreadName = cci("threadName", "threadName", null, null, String.class, "threadName", null, false, + false, false, "String", 0, 0, null, false, null, null, null, null, null, false); + protected final ColumnInfo _columnUrl = cci("url", "url", null, null, String.class, "url", null, false, false, false, "String", 0, 0, + null, false, null, null, null, null, null, false); - public ColumnInfo columnConfigId() { return _columnConfigId; } - public ColumnInfo columnErrorCount() { return _columnErrorCount; } - public ColumnInfo columnErrorLog() { return _columnErrorLog; } - public ColumnInfo columnErrorName() { return _columnErrorName; } - public ColumnInfo columnLastAccessTime() { return _columnLastAccessTime; } - public ColumnInfo columnThreadName() { return _columnThreadName; } - public ColumnInfo columnUrl() { return _columnUrl; } + public ColumnInfo columnConfigId() { + return _columnConfigId; + } + + public ColumnInfo columnErrorCount() { + return _columnErrorCount; + } + + public ColumnInfo columnErrorLog() { + return _columnErrorLog; + } + + public ColumnInfo columnErrorName() { + return _columnErrorName; + } + + public ColumnInfo columnLastAccessTime() { + return _columnLastAccessTime; + } + + public ColumnInfo columnThreadName() { + return _columnThreadName; + } + + public ColumnInfo columnUrl() { + return _columnUrl; + } protected List ccil() { List ls = newArrayList(); @@ -212,4 +256,3 @@ public class FailureUrlDbm extends AbstractDBMeta { return null; } } - diff --git a/src/main/java/org/codelibs/fess/es/config/bsentity/dbmeta/FileAuthenticationDbm.java b/src/main/java/org/codelibs/fess/es/config/bsentity/dbmeta/FileAuthenticationDbm.java index 83a0cea47..5ec6d7701 100644 --- a/src/main/java/org/codelibs/fess/es/config/bsentity/dbmeta/FileAuthenticationDbm.java +++ b/src/main/java/org/codelibs/fess/es/config/bsentity/dbmeta/FileAuthenticationDbm.java @@ -15,12 +15,11 @@ */ package org.codelibs.fess.es.config.bsentity.dbmeta; -import java.time.*; +import java.time.LocalDateTime; 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; @@ -80,17 +79,28 @@ public class FileAuthenticationDbm extends AbstractDBMeta { // --------------- protected final Map _epgMap = newHashMap(); { - setupEpg(_epgMap, et-> ((FileAuthentication)et).getCreatedBy(),(et,vl)->((FileAuthentication) et).setCreatedBy(DfTypeUtil.toString(vl)), "createdBy"); - setupEpg(_epgMap, et-> ((FileAuthentication)et).getCreatedTime(),(et,vl)->((FileAuthentication) et).setCreatedTime(DfTypeUtil.toLong(vl)), "createdTime"); - setupEpg(_epgMap, et-> ((FileAuthentication)et).getFileConfigId(),(et,vl)->((FileAuthentication) et).setFileConfigId(DfTypeUtil.toString(vl)), "fileConfigId"); - setupEpg(_epgMap, et-> ((FileAuthentication)et).getHostname(),(et,vl)->((FileAuthentication) et).setHostname(DfTypeUtil.toString(vl)), "hostname"); - setupEpg(_epgMap, et-> ((FileAuthentication)et).getParameters(),(et,vl)->((FileAuthentication) et).setParameters(DfTypeUtil.toString(vl)), "parameters"); - setupEpg(_epgMap, et-> ((FileAuthentication)et).getPassword(),(et,vl)->((FileAuthentication) et).setPassword(DfTypeUtil.toString(vl)), "password"); - setupEpg(_epgMap, et-> ((FileAuthentication)et).getPort(),(et,vl)->((FileAuthentication) et).setPort(DfTypeUtil.toInteger(vl)), "port"); - setupEpg(_epgMap, et-> ((FileAuthentication)et).getProtocolScheme(),(et,vl)->((FileAuthentication) et).setProtocolScheme(DfTypeUtil.toString(vl)), "protocolScheme"); - setupEpg(_epgMap, et-> ((FileAuthentication)et).getUpdatedBy(),(et,vl)->((FileAuthentication) et).setUpdatedBy(DfTypeUtil.toString(vl)), "updatedBy"); - setupEpg(_epgMap, et-> ((FileAuthentication)et).getUpdatedTime(),(et,vl)->((FileAuthentication) et).setUpdatedTime(DfTypeUtil.toLong(vl)), "updatedTime"); - setupEpg(_epgMap, et-> ((FileAuthentication)et).getUsername(),(et,vl)->((FileAuthentication) et).setUsername(DfTypeUtil.toString(vl)), "username"); + setupEpg(_epgMap, et -> ((FileAuthentication) et).getCreatedBy(), + (et, vl) -> ((FileAuthentication) et).setCreatedBy(DfTypeUtil.toString(vl)), "createdBy"); + setupEpg(_epgMap, et -> ((FileAuthentication) et).getCreatedTime(), + (et, vl) -> ((FileAuthentication) et).setCreatedTime(DfTypeUtil.toLong(vl)), "createdTime"); + setupEpg(_epgMap, et -> ((FileAuthentication) et).getFileConfigId(), + (et, vl) -> ((FileAuthentication) et).setFileConfigId(DfTypeUtil.toString(vl)), "fileConfigId"); + setupEpg(_epgMap, et -> ((FileAuthentication) et).getHostname(), + (et, vl) -> ((FileAuthentication) et).setHostname(DfTypeUtil.toString(vl)), "hostname"); + setupEpg(_epgMap, et -> ((FileAuthentication) et).getParameters(), + (et, vl) -> ((FileAuthentication) et).setParameters(DfTypeUtil.toString(vl)), "parameters"); + setupEpg(_epgMap, et -> ((FileAuthentication) et).getPassword(), + (et, vl) -> ((FileAuthentication) et).setPassword(DfTypeUtil.toString(vl)), "password"); + setupEpg(_epgMap, et -> ((FileAuthentication) et).getPort(), + (et, vl) -> ((FileAuthentication) et).setPort(DfTypeUtil.toInteger(vl)), "port"); + setupEpg(_epgMap, et -> ((FileAuthentication) et).getProtocolScheme(), + (et, vl) -> ((FileAuthentication) et).setProtocolScheme(DfTypeUtil.toString(vl)), "protocolScheme"); + setupEpg(_epgMap, et -> ((FileAuthentication) et).getUpdatedBy(), + (et, vl) -> ((FileAuthentication) et).setUpdatedBy(DfTypeUtil.toString(vl)), "updatedBy"); + setupEpg(_epgMap, et -> ((FileAuthentication) et).getUpdatedTime(), + (et, vl) -> ((FileAuthentication) et).setUpdatedTime(DfTypeUtil.toLong(vl)), "updatedTime"); + setupEpg(_epgMap, et -> ((FileAuthentication) et).getUsername(), + (et, vl) -> ((FileAuthentication) et).setUsername(DfTypeUtil.toString(vl)), "username"); } @Override @@ -104,40 +114,95 @@ public class FileAuthenticationDbm extends AbstractDBMeta { protected final String _tableDbName = "file_authentication"; protected final String _tableDispName = "file_authentication"; protected final String _tablePropertyName = "FileAuthentication"; - public String getTableDbName() { return _tableDbName; } + + public String getTableDbName() { + return _tableDbName; + } + @Override - public String getTableDispName() { return _tableDispName; } + public String getTableDispName() { + return _tableDispName; + } + @Override - public String getTablePropertyName() { return _tablePropertyName; } + public String getTablePropertyName() { + return _tablePropertyName; + } + @Override - public TableSqlName getTableSqlName() { return null; } + public TableSqlName getTableSqlName() { + return null; + } // =================================================================================== // Column Info // =========== - protected final ColumnInfo _columnCreatedBy = cci("createdBy", "createdBy", null, null, String.class, "createdBy", null, false, false, false, "String", 0, 0, null, false, null, null, null, null, null, false); - protected final ColumnInfo _columnCreatedTime = cci("createdTime", "createdTime", null, null, Long.class, "createdTime", null, false, false, false, "Long", 0, 0, null, false, null, null, null, null, null, false); - protected final ColumnInfo _columnFileConfigId = cci("fileConfigId", "fileConfigId", null, null, String.class, "fileConfigId", null, false, false, false, "String", 0, 0, null, false, null, null, null, null, null, false); - protected final ColumnInfo _columnHostname = cci("hostname", "hostname", null, null, String.class, "hostname", null, false, false, false, "String", 0, 0, null, false, null, null, null, null, null, false); - protected final ColumnInfo _columnParameters = cci("parameters", "parameters", null, null, String.class, "parameters", null, false, false, false, "String", 0, 0, null, false, null, null, null, null, null, false); - protected final ColumnInfo _columnPassword = cci("password", "password", null, null, String.class, "password", null, false, false, false, "String", 0, 0, null, false, null, null, null, null, null, false); - protected final ColumnInfo _columnPort = cci("port", "port", null, null, Integer.class, "port", null, false, false, false, "Integer", 0, 0, null, false, null, null, null, null, null, false); - protected final ColumnInfo _columnProtocolScheme = cci("protocolScheme", "protocolScheme", null, null, String.class, "protocolScheme", null, false, false, false, "String", 0, 0, null, false, null, null, null, null, null, false); - protected final ColumnInfo _columnUpdatedBy = cci("updatedBy", "updatedBy", null, null, String.class, "updatedBy", null, false, false, false, "String", 0, 0, null, false, null, null, null, null, null, false); - protected final ColumnInfo _columnUpdatedTime = cci("updatedTime", "updatedTime", null, null, Long.class, "updatedTime", null, false, false, false, "Long", 0, 0, null, false, null, null, null, null, null, false); - protected final ColumnInfo _columnUsername = cci("username", "username", null, null, String.class, "username", null, false, false, false, "String", 0, 0, null, false, null, null, null, null, null, false); + protected final ColumnInfo _columnCreatedBy = cci("createdBy", "createdBy", null, null, String.class, "createdBy", null, false, false, + false, "String", 0, 0, null, false, null, null, null, null, null, false); + protected final ColumnInfo _columnCreatedTime = cci("createdTime", "createdTime", null, null, Long.class, "createdTime", null, false, + false, false, "Long", 0, 0, null, false, null, null, null, null, null, false); + protected final ColumnInfo _columnFileConfigId = cci("fileConfigId", "fileConfigId", null, null, String.class, "fileConfigId", null, + false, false, false, "String", 0, 0, null, false, null, null, null, null, null, false); + protected final ColumnInfo _columnHostname = cci("hostname", "hostname", null, null, String.class, "hostname", null, false, false, + false, "String", 0, 0, null, false, null, null, null, null, null, false); + protected final ColumnInfo _columnParameters = cci("parameters", "parameters", null, null, String.class, "parameters", null, false, + false, false, "String", 0, 0, null, false, null, null, null, null, null, false); + protected final ColumnInfo _columnPassword = cci("password", "password", null, null, String.class, "password", null, false, false, + false, "String", 0, 0, null, false, null, null, null, null, null, false); + protected final ColumnInfo _columnPort = cci("port", "port", null, null, Integer.class, "port", null, false, false, false, "Integer", + 0, 0, null, false, null, null, null, null, null, false); + protected final ColumnInfo _columnProtocolScheme = cci("protocolScheme", "protocolScheme", null, null, String.class, "protocolScheme", + null, false, false, false, "String", 0, 0, null, false, null, null, null, null, null, false); + protected final ColumnInfo _columnUpdatedBy = cci("updatedBy", "updatedBy", null, null, String.class, "updatedBy", null, false, false, + false, "String", 0, 0, null, false, null, null, null, null, null, false); + protected final ColumnInfo _columnUpdatedTime = cci("updatedTime", "updatedTime", null, null, Long.class, "updatedTime", null, false, + false, false, "Long", 0, 0, null, false, null, null, null, null, null, false); + protected final ColumnInfo _columnUsername = cci("username", "username", null, null, String.class, "username", null, false, false, + false, "String", 0, 0, null, false, null, null, null, null, null, false); - public ColumnInfo columnCreatedBy() { return _columnCreatedBy; } - public ColumnInfo columnCreatedTime() { return _columnCreatedTime; } - public ColumnInfo columnFileConfigId() { return _columnFileConfigId; } - public ColumnInfo columnHostname() { return _columnHostname; } - public ColumnInfo columnParameters() { return _columnParameters; } - public ColumnInfo columnPassword() { return _columnPassword; } - public ColumnInfo columnPort() { return _columnPort; } - public ColumnInfo columnProtocolScheme() { return _columnProtocolScheme; } - public ColumnInfo columnUpdatedBy() { return _columnUpdatedBy; } - public ColumnInfo columnUpdatedTime() { return _columnUpdatedTime; } - public ColumnInfo columnUsername() { return _columnUsername; } + public ColumnInfo columnCreatedBy() { + return _columnCreatedBy; + } + + public ColumnInfo columnCreatedTime() { + return _columnCreatedTime; + } + + public ColumnInfo columnFileConfigId() { + return _columnFileConfigId; + } + + public ColumnInfo columnHostname() { + return _columnHostname; + } + + public ColumnInfo columnParameters() { + return _columnParameters; + } + + public ColumnInfo columnPassword() { + return _columnPassword; + } + + public ColumnInfo columnPort() { + return _columnPort; + } + + public ColumnInfo columnProtocolScheme() { + return _columnProtocolScheme; + } + + public ColumnInfo columnUpdatedBy() { + return _columnUpdatedBy; + } + + public ColumnInfo columnUpdatedTime() { + return _columnUpdatedTime; + } + + public ColumnInfo columnUsername() { + return _columnUsername; + } protected List ccil() { List ls = newArrayList(); @@ -228,4 +293,3 @@ public class FileAuthenticationDbm extends AbstractDBMeta { return null; } } - diff --git a/src/main/java/org/codelibs/fess/es/config/bsentity/dbmeta/FileConfigDbm.java b/src/main/java/org/codelibs/fess/es/config/bsentity/dbmeta/FileConfigDbm.java index 7ce0e2a06..480aad572 100644 --- a/src/main/java/org/codelibs/fess/es/config/bsentity/dbmeta/FileConfigDbm.java +++ b/src/main/java/org/codelibs/fess/es/config/bsentity/dbmeta/FileConfigDbm.java @@ -15,12 +15,11 @@ */ package org.codelibs.fess.es.config.bsentity.dbmeta; -import java.time.*; +import java.time.LocalDateTime; 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; @@ -80,26 +79,42 @@ public class FileConfigDbm extends AbstractDBMeta { // --------------- protected final Map _epgMap = newHashMap(); { - setupEpg(_epgMap, et-> ((FileConfig)et).getAvailable(),(et,vl)->((FileConfig) et).setAvailable(DfTypeUtil.toBoolean(vl)), "available"); - setupEpg(_epgMap, et-> ((FileConfig)et).getBoost(),(et,vl)->((FileConfig) et).setBoost(DfTypeUtil.toFloat(vl)), "boost"); - setupEpg(_epgMap, et-> ((FileConfig)et).getConfigParameter(),(et,vl)->((FileConfig) et).setConfigParameter(DfTypeUtil.toString(vl)), "configParameter"); - setupEpg(_epgMap, et-> ((FileConfig)et).getCreatedBy(),(et,vl)->((FileConfig) et).setCreatedBy(DfTypeUtil.toString(vl)), "createdBy"); - setupEpg(_epgMap, et-> ((FileConfig)et).getCreatedTime(),(et,vl)->((FileConfig) et).setCreatedTime(DfTypeUtil.toLong(vl)), "createdTime"); - setupEpg(_epgMap, et-> ((FileConfig)et).getDepth(),(et,vl)->((FileConfig) et).setDepth(DfTypeUtil.toInteger(vl)), "depth"); - setupEpg(_epgMap, et-> ((FileConfig)et).getExcludedDocPaths(),(et,vl)->((FileConfig) et).setExcludedDocPaths(DfTypeUtil.toString(vl)), "excludedDocPaths"); - setupEpg(_epgMap, et-> ((FileConfig)et).getExcludedPaths(),(et,vl)->((FileConfig) et).setExcludedPaths(DfTypeUtil.toString(vl)), "excludedPaths"); - setupEpg(_epgMap, et-> ((FileConfig)et).getIncludedDocPaths(),(et,vl)->((FileConfig) et).setIncludedDocPaths(DfTypeUtil.toString(vl)), "includedDocPaths"); - setupEpg(_epgMap, et-> ((FileConfig)et).getIncludedPaths(),(et,vl)->((FileConfig) et).setIncludedPaths(DfTypeUtil.toString(vl)), "includedPaths"); - setupEpg(_epgMap, et-> ((FileConfig)et).getIntervalTime(),(et,vl)->((FileConfig) et).setIntervalTime(DfTypeUtil.toInteger(vl)), "intervalTime"); - setupEpg(_epgMap, et-> ((FileConfig)et).getTimeToLive(),(et,vl)->((FileConfig) et).setTimeToLive(DfTypeUtil.toInteger(vl)), "timeToLive"); - setupEpg(_epgMap, et-> ((FileConfig)et).getMaxAccessCount(),(et,vl)->((FileConfig) et).setMaxAccessCount(DfTypeUtil.toLong(vl)), "maxAccessCount"); - setupEpg(_epgMap, et-> ((FileConfig)et).getName(),(et,vl)->((FileConfig) et).setName(DfTypeUtil.toString(vl)), "name"); - setupEpg(_epgMap, et-> ((FileConfig)et).getNumOfThread(),(et,vl)->((FileConfig) et).setNumOfThread(DfTypeUtil.toInteger(vl)), "numOfThread"); - setupEpg(_epgMap, et-> ((FileConfig)et).getPaths(),(et,vl)->((FileConfig) et).setPaths(DfTypeUtil.toString(vl)), "paths"); - setupEpg(_epgMap, et-> ((FileConfig)et).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 @@ -113,58 +128,149 @@ 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); + 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; } + 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 ccil() { List ls = newArrayList(); @@ -264,4 +370,3 @@ public class FileConfigDbm extends AbstractDBMeta { return null; } } - diff --git a/src/main/java/org/codelibs/fess/es/config/bsentity/dbmeta/FileConfigToLabelDbm.java b/src/main/java/org/codelibs/fess/es/config/bsentity/dbmeta/FileConfigToLabelDbm.java index fb3aad9d0..23b76d164 100644 --- a/src/main/java/org/codelibs/fess/es/config/bsentity/dbmeta/FileConfigToLabelDbm.java +++ b/src/main/java/org/codelibs/fess/es/config/bsentity/dbmeta/FileConfigToLabelDbm.java @@ -15,12 +15,11 @@ */ package org.codelibs.fess.es.config.bsentity.dbmeta; -import java.time.*; +import java.time.LocalDateTime; 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; @@ -80,8 +79,10 @@ public class FileConfigToLabelDbm extends AbstractDBMeta { // --------------- protected final Map _epgMap = newHashMap(); { - setupEpg(_epgMap, et-> ((FileConfigToLabel)et).getFileConfigId(),(et,vl)->((FileConfigToLabel) et).setFileConfigId(DfTypeUtil.toString(vl)), "fileConfigId"); - setupEpg(_epgMap, et-> ((FileConfigToLabel)et).getLabelTypeId(),(et,vl)->((FileConfigToLabel) et).setLabelTypeId(DfTypeUtil.toString(vl)), "labelTypeId"); + setupEpg(_epgMap, et -> ((FileConfigToLabel) et).getFileConfigId(), + (et, vl) -> ((FileConfigToLabel) et).setFileConfigId(DfTypeUtil.toString(vl)), "fileConfigId"); + setupEpg(_epgMap, et -> ((FileConfigToLabel) et).getLabelTypeId(), + (et, vl) -> ((FileConfigToLabel) et).setLabelTypeId(DfTypeUtil.toString(vl)), "labelTypeId"); } @Override @@ -95,22 +96,41 @@ public class FileConfigToLabelDbm extends AbstractDBMeta { protected final String _tableDbName = "file_config_to_label"; protected final String _tableDispName = "file_config_to_label"; protected final String _tablePropertyName = "FileConfigToLabel"; - public String getTableDbName() { return _tableDbName; } + + public String getTableDbName() { + return _tableDbName; + } + @Override - public String getTableDispName() { return _tableDispName; } + public String getTableDispName() { + return _tableDispName; + } + @Override - public String getTablePropertyName() { return _tablePropertyName; } + public String getTablePropertyName() { + return _tablePropertyName; + } + @Override - public TableSqlName getTableSqlName() { return null; } + public TableSqlName getTableSqlName() { + return null; + } // =================================================================================== // Column Info // =========== - protected final ColumnInfo _columnFileConfigId = cci("fileConfigId", "fileConfigId", null, null, String.class, "fileConfigId", null, false, false, false, "String", 0, 0, null, false, null, null, null, null, null, false); - protected final ColumnInfo _columnLabelTypeId = cci("labelTypeId", "labelTypeId", null, null, String.class, "labelTypeId", null, false, false, false, "String", 0, 0, null, false, null, null, null, null, null, false); + protected final ColumnInfo _columnFileConfigId = cci("fileConfigId", "fileConfigId", null, null, String.class, "fileConfigId", null, + false, false, false, "String", 0, 0, null, false, null, null, null, null, null, false); + protected final ColumnInfo _columnLabelTypeId = cci("labelTypeId", "labelTypeId", null, null, String.class, "labelTypeId", null, false, + false, false, "String", 0, 0, null, false, null, null, null, null, null, false); - public ColumnInfo columnFileConfigId() { return _columnFileConfigId; } - public ColumnInfo columnLabelTypeId() { return _columnLabelTypeId; } + public ColumnInfo columnFileConfigId() { + return _columnFileConfigId; + } + + public ColumnInfo columnLabelTypeId() { + return _columnLabelTypeId; + } protected List ccil() { List ls = newArrayList(); @@ -192,4 +212,3 @@ public class FileConfigToLabelDbm extends AbstractDBMeta { return null; } } - diff --git a/src/main/java/org/codelibs/fess/es/config/bsentity/dbmeta/FileConfigToRoleDbm.java b/src/main/java/org/codelibs/fess/es/config/bsentity/dbmeta/FileConfigToRoleDbm.java index ae836c886..e854738b0 100644 --- a/src/main/java/org/codelibs/fess/es/config/bsentity/dbmeta/FileConfigToRoleDbm.java +++ b/src/main/java/org/codelibs/fess/es/config/bsentity/dbmeta/FileConfigToRoleDbm.java @@ -15,12 +15,11 @@ */ package org.codelibs.fess.es.config.bsentity.dbmeta; -import java.time.*; +import java.time.LocalDateTime; 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; @@ -80,8 +79,10 @@ public class FileConfigToRoleDbm extends AbstractDBMeta { // --------------- protected final Map _epgMap = newHashMap(); { - setupEpg(_epgMap, et-> ((FileConfigToRole)et).getFileConfigId(),(et,vl)->((FileConfigToRole) et).setFileConfigId(DfTypeUtil.toString(vl)), "fileConfigId"); - setupEpg(_epgMap, et-> ((FileConfigToRole)et).getRoleTypeId(),(et,vl)->((FileConfigToRole) et).setRoleTypeId(DfTypeUtil.toString(vl)), "roleTypeId"); + setupEpg(_epgMap, et -> ((FileConfigToRole) et).getFileConfigId(), + (et, vl) -> ((FileConfigToRole) et).setFileConfigId(DfTypeUtil.toString(vl)), "fileConfigId"); + setupEpg(_epgMap, et -> ((FileConfigToRole) et).getRoleTypeId(), + (et, vl) -> ((FileConfigToRole) et).setRoleTypeId(DfTypeUtil.toString(vl)), "roleTypeId"); } @Override @@ -95,22 +96,41 @@ public class FileConfigToRoleDbm extends AbstractDBMeta { protected final String _tableDbName = "file_config_to_role"; protected final String _tableDispName = "file_config_to_role"; protected final String _tablePropertyName = "FileConfigToRole"; - public String getTableDbName() { return _tableDbName; } + + public String getTableDbName() { + return _tableDbName; + } + @Override - public String getTableDispName() { return _tableDispName; } + public String getTableDispName() { + return _tableDispName; + } + @Override - public String getTablePropertyName() { return _tablePropertyName; } + public String getTablePropertyName() { + return _tablePropertyName; + } + @Override - public TableSqlName getTableSqlName() { return null; } + public TableSqlName getTableSqlName() { + return null; + } // =================================================================================== // Column Info // =========== - protected final ColumnInfo _columnFileConfigId = cci("fileConfigId", "fileConfigId", null, null, String.class, "fileConfigId", null, false, false, false, "String", 0, 0, null, false, null, null, null, null, null, false); - protected final ColumnInfo _columnRoleTypeId = cci("roleTypeId", "roleTypeId", null, null, String.class, "roleTypeId", null, false, false, false, "String", 0, 0, null, false, null, null, null, null, null, false); + protected final ColumnInfo _columnFileConfigId = cci("fileConfigId", "fileConfigId", null, null, String.class, "fileConfigId", null, + false, false, false, "String", 0, 0, null, false, null, null, null, null, null, false); + protected final ColumnInfo _columnRoleTypeId = cci("roleTypeId", "roleTypeId", null, null, String.class, "roleTypeId", null, false, + false, false, "String", 0, 0, null, false, null, null, null, null, null, false); - public ColumnInfo columnFileConfigId() { return _columnFileConfigId; } - public ColumnInfo columnRoleTypeId() { return _columnRoleTypeId; } + public ColumnInfo columnFileConfigId() { + return _columnFileConfigId; + } + + public ColumnInfo columnRoleTypeId() { + return _columnRoleTypeId; + } protected List ccil() { List ls = newArrayList(); @@ -192,4 +212,3 @@ public class FileConfigToRoleDbm extends AbstractDBMeta { return null; } } - diff --git a/src/main/java/org/codelibs/fess/es/config/bsentity/dbmeta/JobLogDbm.java b/src/main/java/org/codelibs/fess/es/config/bsentity/dbmeta/JobLogDbm.java index 25f76332c..02e22eafd 100644 --- a/src/main/java/org/codelibs/fess/es/config/bsentity/dbmeta/JobLogDbm.java +++ b/src/main/java/org/codelibs/fess/es/config/bsentity/dbmeta/JobLogDbm.java @@ -15,12 +15,11 @@ */ package org.codelibs.fess.es.config.bsentity.dbmeta; -import java.time.*; +import java.time.LocalDateTime; 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; @@ -80,14 +79,17 @@ public class JobLogDbm extends AbstractDBMeta { // --------------- protected final Map _epgMap = newHashMap(); { - setupEpg(_epgMap, et-> ((JobLog)et).getEndTime(),(et,vl)->((JobLog) et).setEndTime(DfTypeUtil.toLong(vl)), "endTime"); - setupEpg(_epgMap, et-> ((JobLog)et).getJobName(),(et,vl)->((JobLog) et).setJobName(DfTypeUtil.toString(vl)), "jobName"); - setupEpg(_epgMap, et-> ((JobLog)et).getJobStatus(),(et,vl)->((JobLog) et).setJobStatus(DfTypeUtil.toString(vl)), "jobStatus"); - setupEpg(_epgMap, et-> ((JobLog)et).getScriptData(),(et,vl)->((JobLog) et).setScriptData(DfTypeUtil.toString(vl)), "scriptData"); - setupEpg(_epgMap, et-> ((JobLog)et).getScriptResult(),(et,vl)->((JobLog) et).setScriptResult(DfTypeUtil.toString(vl)), "scriptResult"); - setupEpg(_epgMap, et-> ((JobLog)et).getScriptType(),(et,vl)->((JobLog) et).setScriptType(DfTypeUtil.toString(vl)), "scriptType"); - setupEpg(_epgMap, et-> ((JobLog)et).getStartTime(),(et,vl)->((JobLog) et).setStartTime(DfTypeUtil.toLong(vl)), "startTime"); - setupEpg(_epgMap, et-> ((JobLog)et).getTarget(),(et,vl)->((JobLog) et).setTarget(DfTypeUtil.toString(vl)), "target"); + setupEpg(_epgMap, et -> ((JobLog) et).getEndTime(), (et, vl) -> ((JobLog) et).setEndTime(DfTypeUtil.toLong(vl)), "endTime"); + setupEpg(_epgMap, et -> ((JobLog) et).getJobName(), (et, vl) -> ((JobLog) et).setJobName(DfTypeUtil.toString(vl)), "jobName"); + setupEpg(_epgMap, et -> ((JobLog) et).getJobStatus(), (et, vl) -> ((JobLog) et).setJobStatus(DfTypeUtil.toString(vl)), "jobStatus"); + setupEpg(_epgMap, et -> ((JobLog) et).getScriptData(), (et, vl) -> ((JobLog) et).setScriptData(DfTypeUtil.toString(vl)), + "scriptData"); + setupEpg(_epgMap, et -> ((JobLog) et).getScriptResult(), (et, vl) -> ((JobLog) et).setScriptResult(DfTypeUtil.toString(vl)), + "scriptResult"); + setupEpg(_epgMap, et -> ((JobLog) et).getScriptType(), (et, vl) -> ((JobLog) et).setScriptType(DfTypeUtil.toString(vl)), + "scriptType"); + setupEpg(_epgMap, et -> ((JobLog) et).getStartTime(), (et, vl) -> ((JobLog) et).setStartTime(DfTypeUtil.toLong(vl)), "startTime"); + setupEpg(_epgMap, et -> ((JobLog) et).getTarget(), (et, vl) -> ((JobLog) et).setTarget(DfTypeUtil.toString(vl)), "target"); } @Override @@ -101,34 +103,77 @@ public class JobLogDbm extends AbstractDBMeta { protected final String _tableDbName = "job_log"; protected final String _tableDispName = "job_log"; protected final String _tablePropertyName = "JobLog"; - public String getTableDbName() { return _tableDbName; } + + public String getTableDbName() { + return _tableDbName; + } + @Override - public String getTableDispName() { return _tableDispName; } + public String getTableDispName() { + return _tableDispName; + } + @Override - public String getTablePropertyName() { return _tablePropertyName; } + public String getTablePropertyName() { + return _tablePropertyName; + } + @Override - public TableSqlName getTableSqlName() { return null; } + public TableSqlName getTableSqlName() { + return null; + } // =================================================================================== // Column Info // =========== - protected final ColumnInfo _columnEndTime = cci("endTime", "endTime", null, null, Long.class, "endTime", null, false, false, false, "Long", 0, 0, null, false, null, null, null, null, null, false); - protected final ColumnInfo _columnJobName = cci("jobName", "jobName", null, null, String.class, "jobName", null, false, false, false, "String", 0, 0, null, false, null, null, null, null, null, false); - protected final ColumnInfo _columnJobStatus = cci("jobStatus", "jobStatus", null, null, String.class, "jobStatus", null, false, false, false, "String", 0, 0, null, false, null, null, null, null, null, false); - protected final ColumnInfo _columnScriptData = cci("scriptData", "scriptData", null, null, String.class, "scriptData", null, false, false, false, "String", 0, 0, null, false, null, null, null, null, null, false); - protected final ColumnInfo _columnScriptResult = cci("scriptResult", "scriptResult", null, null, String.class, "scriptResult", null, false, false, false, "String", 0, 0, null, false, null, null, null, null, null, false); - protected final ColumnInfo _columnScriptType = cci("scriptType", "scriptType", null, null, String.class, "scriptType", null, false, false, false, "String", 0, 0, null, false, null, null, null, null, null, false); - protected final ColumnInfo _columnStartTime = cci("startTime", "startTime", null, null, Long.class, "startTime", null, false, false, false, "Long", 0, 0, null, false, null, null, null, null, null, false); - protected final ColumnInfo _columnTarget = cci("target", "target", null, null, String.class, "target", null, false, false, false, "String", 0, 0, null, false, null, null, null, null, null, false); + protected final ColumnInfo _columnEndTime = cci("endTime", "endTime", null, null, Long.class, "endTime", null, false, false, false, + "Long", 0, 0, null, false, null, null, null, null, null, false); + protected final ColumnInfo _columnJobName = cci("jobName", "jobName", null, null, String.class, "jobName", null, false, false, false, + "String", 0, 0, null, false, null, null, null, null, null, false); + protected final ColumnInfo _columnJobStatus = cci("jobStatus", "jobStatus", null, null, String.class, "jobStatus", null, false, false, + false, "String", 0, 0, null, false, null, null, null, null, null, false); + protected final ColumnInfo _columnScriptData = cci("scriptData", "scriptData", null, null, String.class, "scriptData", null, false, + false, false, "String", 0, 0, null, false, null, null, null, null, null, false); + protected final ColumnInfo _columnScriptResult = cci("scriptResult", "scriptResult", null, null, String.class, "scriptResult", null, + false, false, false, "String", 0, 0, null, false, null, null, null, null, null, false); + protected final ColumnInfo _columnScriptType = cci("scriptType", "scriptType", null, null, String.class, "scriptType", null, false, + false, false, "String", 0, 0, null, false, null, null, null, null, null, false); + protected final ColumnInfo _columnStartTime = cci("startTime", "startTime", null, null, Long.class, "startTime", null, false, false, + false, "Long", 0, 0, null, false, null, null, null, null, null, false); + protected final ColumnInfo _columnTarget = cci("target", "target", null, null, String.class, "target", null, false, false, false, + "String", 0, 0, null, false, null, null, null, null, null, false); - public ColumnInfo columnEndTime() { return _columnEndTime; } - public ColumnInfo columnJobName() { return _columnJobName; } - public ColumnInfo columnJobStatus() { return _columnJobStatus; } - public ColumnInfo columnScriptData() { return _columnScriptData; } - public ColumnInfo columnScriptResult() { return _columnScriptResult; } - public ColumnInfo columnScriptType() { return _columnScriptType; } - public ColumnInfo columnStartTime() { return _columnStartTime; } - public ColumnInfo columnTarget() { return _columnTarget; } + public ColumnInfo columnEndTime() { + return _columnEndTime; + } + + public ColumnInfo columnJobName() { + return _columnJobName; + } + + public ColumnInfo columnJobStatus() { + return _columnJobStatus; + } + + public ColumnInfo columnScriptData() { + return _columnScriptData; + } + + public ColumnInfo columnScriptResult() { + return _columnScriptResult; + } + + public ColumnInfo columnScriptType() { + return _columnScriptType; + } + + public ColumnInfo columnStartTime() { + return _columnStartTime; + } + + public ColumnInfo columnTarget() { + return _columnTarget; + } protected List ccil() { List ls = newArrayList(); @@ -216,4 +261,3 @@ public class JobLogDbm extends AbstractDBMeta { return null; } } - diff --git a/src/main/java/org/codelibs/fess/es/config/bsentity/dbmeta/KeyMatchDbm.java b/src/main/java/org/codelibs/fess/es/config/bsentity/dbmeta/KeyMatchDbm.java index 8e0cdb8a8..f1b2808c0 100644 --- a/src/main/java/org/codelibs/fess/es/config/bsentity/dbmeta/KeyMatchDbm.java +++ b/src/main/java/org/codelibs/fess/es/config/bsentity/dbmeta/KeyMatchDbm.java @@ -15,12 +15,11 @@ */ package org.codelibs.fess.es.config.bsentity.dbmeta; -import java.time.*; +import java.time.LocalDateTime; 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; @@ -80,14 +79,18 @@ public class KeyMatchDbm extends AbstractDBMeta { // --------------- protected final Map _epgMap = newHashMap(); { - setupEpg(_epgMap, et-> ((KeyMatch)et).getBoost(),(et,vl)->((KeyMatch) et).setBoost(DfTypeUtil.toFloat(vl)), "boost"); - setupEpg(_epgMap, et-> ((KeyMatch)et).getCreatedBy(),(et,vl)->((KeyMatch) et).setCreatedBy(DfTypeUtil.toString(vl)), "createdBy"); - setupEpg(_epgMap, et-> ((KeyMatch)et).getCreatedTime(),(et,vl)->((KeyMatch) et).setCreatedTime(DfTypeUtil.toLong(vl)), "createdTime"); - setupEpg(_epgMap, et-> ((KeyMatch)et).getMaxSize(),(et,vl)->((KeyMatch) et).setMaxSize(DfTypeUtil.toInteger(vl)), "maxSize"); - setupEpg(_epgMap, et-> ((KeyMatch)et).getQuery(),(et,vl)->((KeyMatch) et).setQuery(DfTypeUtil.toString(vl)), "query"); - setupEpg(_epgMap, et-> ((KeyMatch)et).getTerm(),(et,vl)->((KeyMatch) et).setTerm(DfTypeUtil.toString(vl)), "term"); - setupEpg(_epgMap, et-> ((KeyMatch)et).getUpdatedBy(),(et,vl)->((KeyMatch) et).setUpdatedBy(DfTypeUtil.toString(vl)), "updatedBy"); - setupEpg(_epgMap, et-> ((KeyMatch)et).getUpdatedTime(),(et,vl)->((KeyMatch) et).setUpdatedTime(DfTypeUtil.toLong(vl)), "updatedTime"); + setupEpg(_epgMap, et -> ((KeyMatch) et).getBoost(), (et, vl) -> ((KeyMatch) et).setBoost(DfTypeUtil.toFloat(vl)), "boost"); + setupEpg(_epgMap, et -> ((KeyMatch) et).getCreatedBy(), (et, vl) -> ((KeyMatch) et).setCreatedBy(DfTypeUtil.toString(vl)), + "createdBy"); + setupEpg(_epgMap, et -> ((KeyMatch) et).getCreatedTime(), (et, vl) -> ((KeyMatch) et).setCreatedTime(DfTypeUtil.toLong(vl)), + "createdTime"); + setupEpg(_epgMap, et -> ((KeyMatch) et).getMaxSize(), (et, vl) -> ((KeyMatch) et).setMaxSize(DfTypeUtil.toInteger(vl)), "maxSize"); + setupEpg(_epgMap, et -> ((KeyMatch) et).getQuery(), (et, vl) -> ((KeyMatch) et).setQuery(DfTypeUtil.toString(vl)), "query"); + setupEpg(_epgMap, et -> ((KeyMatch) et).getTerm(), (et, vl) -> ((KeyMatch) et).setTerm(DfTypeUtil.toString(vl)), "term"); + setupEpg(_epgMap, et -> ((KeyMatch) et).getUpdatedBy(), (et, vl) -> ((KeyMatch) et).setUpdatedBy(DfTypeUtil.toString(vl)), + "updatedBy"); + setupEpg(_epgMap, et -> ((KeyMatch) et).getUpdatedTime(), (et, vl) -> ((KeyMatch) et).setUpdatedTime(DfTypeUtil.toLong(vl)), + "updatedTime"); } @Override @@ -101,34 +104,77 @@ public class KeyMatchDbm extends AbstractDBMeta { protected final String _tableDbName = "key_match"; protected final String _tableDispName = "key_match"; protected final String _tablePropertyName = "KeyMatch"; - public String getTableDbName() { return _tableDbName; } + + public String getTableDbName() { + return _tableDbName; + } + @Override - public String getTableDispName() { return _tableDispName; } + public String getTableDispName() { + return _tableDispName; + } + @Override - public String getTablePropertyName() { return _tablePropertyName; } + public String getTablePropertyName() { + return _tablePropertyName; + } + @Override - public TableSqlName getTableSqlName() { return null; } + public TableSqlName getTableSqlName() { + return null; + } // =================================================================================== // Column Info // =========== - protected final ColumnInfo _columnBoost = cci("boost", "boost", null, null, Float.class, "boost", null, false, false, false, "Float", 0, 0, null, false, null, null, null, null, null, false); - protected final ColumnInfo _columnCreatedBy = cci("createdBy", "createdBy", null, null, String.class, "createdBy", null, false, false, false, "String", 0, 0, null, false, null, null, null, null, null, false); - protected final ColumnInfo _columnCreatedTime = cci("createdTime", "createdTime", null, null, Long.class, "createdTime", null, false, false, false, "Long", 0, 0, null, false, null, null, null, null, null, false); - protected final ColumnInfo _columnMaxSize = cci("maxSize", "maxSize", null, null, Integer.class, "maxSize", null, false, false, false, "Integer", 0, 0, null, false, null, null, null, null, null, false); - protected final ColumnInfo _columnQuery = cci("query", "query", null, null, String.class, "query", null, false, false, false, "String", 0, 0, null, false, null, null, null, null, null, false); - protected final ColumnInfo _columnTerm = cci("term", "term", null, null, String.class, "term", null, false, false, false, "String", 0, 0, null, false, null, null, null, null, null, false); - protected final ColumnInfo _columnUpdatedBy = cci("updatedBy", "updatedBy", null, null, String.class, "updatedBy", null, false, false, false, "String", 0, 0, null, false, null, null, null, null, null, false); - protected final ColumnInfo _columnUpdatedTime = cci("updatedTime", "updatedTime", null, null, Long.class, "updatedTime", null, false, false, false, "Long", 0, 0, null, false, null, null, null, null, null, false); + protected final ColumnInfo _columnBoost = cci("boost", "boost", null, null, Float.class, "boost", null, false, false, false, "Float", + 0, 0, null, false, null, null, null, null, null, false); + protected final ColumnInfo _columnCreatedBy = cci("createdBy", "createdBy", null, null, String.class, "createdBy", null, false, false, + false, "String", 0, 0, null, false, null, null, null, null, null, false); + protected final ColumnInfo _columnCreatedTime = cci("createdTime", "createdTime", null, null, Long.class, "createdTime", null, false, + false, false, "Long", 0, 0, null, false, null, null, null, null, null, false); + protected final ColumnInfo _columnMaxSize = cci("maxSize", "maxSize", null, null, Integer.class, "maxSize", null, false, false, false, + "Integer", 0, 0, null, false, null, null, null, null, null, false); + protected final ColumnInfo _columnQuery = cci("query", "query", null, null, String.class, "query", null, false, false, false, "String", + 0, 0, null, false, null, null, null, null, null, false); + protected final ColumnInfo _columnTerm = cci("term", "term", null, null, String.class, "term", null, false, false, false, "String", 0, + 0, null, false, null, null, null, null, null, false); + protected final ColumnInfo _columnUpdatedBy = cci("updatedBy", "updatedBy", null, null, String.class, "updatedBy", null, false, false, + false, "String", 0, 0, null, false, null, null, null, null, null, false); + protected final ColumnInfo _columnUpdatedTime = cci("updatedTime", "updatedTime", null, null, Long.class, "updatedTime", null, false, + false, false, "Long", 0, 0, null, false, null, null, null, null, null, false); - public ColumnInfo columnBoost() { return _columnBoost; } - public ColumnInfo columnCreatedBy() { return _columnCreatedBy; } - public ColumnInfo columnCreatedTime() { return _columnCreatedTime; } - public ColumnInfo columnMaxSize() { return _columnMaxSize; } - public ColumnInfo columnQuery() { return _columnQuery; } - public ColumnInfo columnTerm() { return _columnTerm; } - public ColumnInfo columnUpdatedBy() { return _columnUpdatedBy; } - public ColumnInfo columnUpdatedTime() { return _columnUpdatedTime; } + public ColumnInfo columnBoost() { + return _columnBoost; + } + + public ColumnInfo columnCreatedBy() { + return _columnCreatedBy; + } + + public ColumnInfo columnCreatedTime() { + return _columnCreatedTime; + } + + public ColumnInfo columnMaxSize() { + return _columnMaxSize; + } + + public ColumnInfo columnQuery() { + return _columnQuery; + } + + public ColumnInfo columnTerm() { + return _columnTerm; + } + + public ColumnInfo columnUpdatedBy() { + return _columnUpdatedBy; + } + + public ColumnInfo columnUpdatedTime() { + return _columnUpdatedTime; + } protected List ccil() { List ls = newArrayList(); @@ -216,4 +262,3 @@ public class KeyMatchDbm extends AbstractDBMeta { return null; } } - diff --git a/src/main/java/org/codelibs/fess/es/config/bsentity/dbmeta/LabelToRoleDbm.java b/src/main/java/org/codelibs/fess/es/config/bsentity/dbmeta/LabelToRoleDbm.java index de2c24c11..cd15170c6 100644 --- a/src/main/java/org/codelibs/fess/es/config/bsentity/dbmeta/LabelToRoleDbm.java +++ b/src/main/java/org/codelibs/fess/es/config/bsentity/dbmeta/LabelToRoleDbm.java @@ -15,12 +15,11 @@ */ package org.codelibs.fess.es.config.bsentity.dbmeta; -import java.time.*; +import java.time.LocalDateTime; 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; @@ -80,8 +79,10 @@ public class LabelToRoleDbm extends AbstractDBMeta { // --------------- protected final Map _epgMap = newHashMap(); { - setupEpg(_epgMap, et-> ((LabelToRole)et).getLabelTypeId(),(et,vl)->((LabelToRole) et).setLabelTypeId(DfTypeUtil.toString(vl)), "labelTypeId"); - setupEpg(_epgMap, et-> ((LabelToRole)et).getRoleTypeId(),(et,vl)->((LabelToRole) et).setRoleTypeId(DfTypeUtil.toString(vl)), "roleTypeId"); + setupEpg(_epgMap, et -> ((LabelToRole) et).getLabelTypeId(), + (et, vl) -> ((LabelToRole) et).setLabelTypeId(DfTypeUtil.toString(vl)), "labelTypeId"); + setupEpg(_epgMap, et -> ((LabelToRole) et).getRoleTypeId(), (et, vl) -> ((LabelToRole) et).setRoleTypeId(DfTypeUtil.toString(vl)), + "roleTypeId"); } @Override @@ -95,22 +96,41 @@ public class LabelToRoleDbm extends AbstractDBMeta { protected final String _tableDbName = "label_to_role"; protected final String _tableDispName = "label_to_role"; protected final String _tablePropertyName = "LabelToRole"; - public String getTableDbName() { return _tableDbName; } + + public String getTableDbName() { + return _tableDbName; + } + @Override - public String getTableDispName() { return _tableDispName; } + public String getTableDispName() { + return _tableDispName; + } + @Override - public String getTablePropertyName() { return _tablePropertyName; } + public String getTablePropertyName() { + return _tablePropertyName; + } + @Override - public TableSqlName getTableSqlName() { return null; } + public TableSqlName getTableSqlName() { + return null; + } // =================================================================================== // Column Info // =========== - protected final ColumnInfo _columnLabelTypeId = cci("labelTypeId", "labelTypeId", null, null, String.class, "labelTypeId", null, false, false, false, "String", 0, 0, null, false, null, null, null, null, null, false); - protected final ColumnInfo _columnRoleTypeId = cci("roleTypeId", "roleTypeId", null, null, String.class, "roleTypeId", null, false, false, false, "String", 0, 0, null, false, null, null, null, null, null, false); + protected final ColumnInfo _columnLabelTypeId = cci("labelTypeId", "labelTypeId", null, null, String.class, "labelTypeId", null, false, + false, false, "String", 0, 0, null, false, null, null, null, null, null, false); + protected final ColumnInfo _columnRoleTypeId = cci("roleTypeId", "roleTypeId", null, null, String.class, "roleTypeId", null, false, + false, false, "String", 0, 0, null, false, null, null, null, null, null, false); - public ColumnInfo columnLabelTypeId() { return _columnLabelTypeId; } - public ColumnInfo columnRoleTypeId() { return _columnRoleTypeId; } + public ColumnInfo columnLabelTypeId() { + return _columnLabelTypeId; + } + + public ColumnInfo columnRoleTypeId() { + return _columnRoleTypeId; + } protected List ccil() { List ls = newArrayList(); @@ -192,4 +212,3 @@ public class LabelToRoleDbm extends AbstractDBMeta { return null; } } - diff --git a/src/main/java/org/codelibs/fess/es/config/bsentity/dbmeta/LabelTypeDbm.java b/src/main/java/org/codelibs/fess/es/config/bsentity/dbmeta/LabelTypeDbm.java index 033f99f93..31e3c01f6 100644 --- a/src/main/java/org/codelibs/fess/es/config/bsentity/dbmeta/LabelTypeDbm.java +++ b/src/main/java/org/codelibs/fess/es/config/bsentity/dbmeta/LabelTypeDbm.java @@ -15,12 +15,11 @@ */ package org.codelibs.fess.es.config.bsentity.dbmeta; -import java.time.*; +import java.time.LocalDateTime; 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; @@ -80,16 +79,24 @@ public class LabelTypeDbm extends AbstractDBMeta { // --------------- protected final Map _epgMap = newHashMap(); { - setupEpg(_epgMap, et-> ((LabelType)et).getCreatedBy(),(et,vl)->((LabelType) et).setCreatedBy(DfTypeUtil.toString(vl)), "createdBy"); - setupEpg(_epgMap, et-> ((LabelType)et).getCreatedTime(),(et,vl)->((LabelType) et).setCreatedTime(DfTypeUtil.toLong(vl)), "createdTime"); - setupEpg(_epgMap, et-> ((LabelType)et).getExcludedPaths(),(et,vl)->((LabelType) et).setExcludedPaths(DfTypeUtil.toString(vl)), "excludedPaths"); - setupEpg(_epgMap, et-> ((LabelType)et).getIncludedPaths(),(et,vl)->((LabelType) et).setIncludedPaths(DfTypeUtil.toString(vl)), "includedPaths"); - setupEpg(_epgMap, et-> ((LabelType)et).getName(),(et,vl)->((LabelType) et).setName(DfTypeUtil.toString(vl)), "name"); - setupEpg(_epgMap, et-> ((LabelType)et).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 @@ -103,38 +110,89 @@ 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); + 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; } + 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 ccil() { List ls = newArrayList(); @@ -224,4 +282,3 @@ public class LabelTypeDbm extends AbstractDBMeta { return null; } } - diff --git a/src/main/java/org/codelibs/fess/es/config/bsentity/dbmeta/PathMappingDbm.java b/src/main/java/org/codelibs/fess/es/config/bsentity/dbmeta/PathMappingDbm.java index 4210023de..98de50b01 100644 --- a/src/main/java/org/codelibs/fess/es/config/bsentity/dbmeta/PathMappingDbm.java +++ b/src/main/java/org/codelibs/fess/es/config/bsentity/dbmeta/PathMappingDbm.java @@ -15,12 +15,11 @@ */ package org.codelibs.fess.es.config.bsentity.dbmeta; -import java.time.*; +import java.time.LocalDateTime; 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; @@ -80,14 +79,21 @@ public class PathMappingDbm extends AbstractDBMeta { // --------------- protected final Map _epgMap = newHashMap(); { - setupEpg(_epgMap, et-> ((PathMapping)et).getCreatedBy(),(et,vl)->((PathMapping) et).setCreatedBy(DfTypeUtil.toString(vl)), "createdBy"); - setupEpg(_epgMap, et-> ((PathMapping)et).getCreatedTime(),(et,vl)->((PathMapping) et).setCreatedTime(DfTypeUtil.toLong(vl)), "createdTime"); - setupEpg(_epgMap, et-> ((PathMapping)et).getProcessType(),(et,vl)->((PathMapping) et).setProcessType(DfTypeUtil.toString(vl)), "processType"); - setupEpg(_epgMap, et-> ((PathMapping)et).getRegex(),(et,vl)->((PathMapping) et).setRegex(DfTypeUtil.toString(vl)), "regex"); - setupEpg(_epgMap, et-> ((PathMapping)et).getReplacement(),(et,vl)->((PathMapping) et).setReplacement(DfTypeUtil.toString(vl)), "replacement"); - setupEpg(_epgMap, et-> ((PathMapping)et).getSortOrder(),(et,vl)->((PathMapping) et).setSortOrder(DfTypeUtil.toInteger(vl)), "sortOrder"); - setupEpg(_epgMap, et-> ((PathMapping)et).getUpdatedBy(),(et,vl)->((PathMapping) et).setUpdatedBy(DfTypeUtil.toString(vl)), "updatedBy"); - setupEpg(_epgMap, et-> ((PathMapping)et).getUpdatedTime(),(et,vl)->((PathMapping) et).setUpdatedTime(DfTypeUtil.toLong(vl)), "updatedTime"); + setupEpg(_epgMap, et -> ((PathMapping) et).getCreatedBy(), (et, vl) -> ((PathMapping) et).setCreatedBy(DfTypeUtil.toString(vl)), + "createdBy"); + setupEpg(_epgMap, et -> ((PathMapping) et).getCreatedTime(), (et, vl) -> ((PathMapping) et).setCreatedTime(DfTypeUtil.toLong(vl)), + "createdTime"); + setupEpg(_epgMap, et -> ((PathMapping) et).getProcessType(), + (et, vl) -> ((PathMapping) et).setProcessType(DfTypeUtil.toString(vl)), "processType"); + setupEpg(_epgMap, et -> ((PathMapping) et).getRegex(), (et, vl) -> ((PathMapping) et).setRegex(DfTypeUtil.toString(vl)), "regex"); + setupEpg(_epgMap, et -> ((PathMapping) et).getReplacement(), + (et, vl) -> ((PathMapping) et).setReplacement(DfTypeUtil.toString(vl)), "replacement"); + setupEpg(_epgMap, et -> ((PathMapping) et).getSortOrder(), (et, vl) -> ((PathMapping) et).setSortOrder(DfTypeUtil.toInteger(vl)), + "sortOrder"); + setupEpg(_epgMap, et -> ((PathMapping) et).getUpdatedBy(), (et, vl) -> ((PathMapping) et).setUpdatedBy(DfTypeUtil.toString(vl)), + "updatedBy"); + setupEpg(_epgMap, et -> ((PathMapping) et).getUpdatedTime(), (et, vl) -> ((PathMapping) et).setUpdatedTime(DfTypeUtil.toLong(vl)), + "updatedTime"); } @Override @@ -101,34 +107,77 @@ public class PathMappingDbm extends AbstractDBMeta { protected final String _tableDbName = "path_mapping"; protected final String _tableDispName = "path_mapping"; protected final String _tablePropertyName = "PathMapping"; - public String getTableDbName() { return _tableDbName; } + + public String getTableDbName() { + return _tableDbName; + } + @Override - public String getTableDispName() { return _tableDispName; } + public String getTableDispName() { + return _tableDispName; + } + @Override - public String getTablePropertyName() { return _tablePropertyName; } + public String getTablePropertyName() { + return _tablePropertyName; + } + @Override - public TableSqlName getTableSqlName() { return null; } + public TableSqlName getTableSqlName() { + return null; + } // =================================================================================== // Column Info // =========== - protected final ColumnInfo _columnCreatedBy = cci("createdBy", "createdBy", null, null, String.class, "createdBy", null, false, false, false, "String", 0, 0, null, false, null, null, null, null, null, false); - protected final ColumnInfo _columnCreatedTime = cci("createdTime", "createdTime", null, null, Long.class, "createdTime", null, false, false, false, "Long", 0, 0, null, false, null, null, null, null, null, false); - protected final ColumnInfo _columnProcessType = cci("processType", "processType", null, null, String.class, "processType", null, false, false, false, "String", 0, 0, null, false, null, null, null, null, null, false); - protected final ColumnInfo _columnRegex = cci("regex", "regex", null, null, String.class, "regex", null, false, false, false, "String", 0, 0, null, false, null, null, null, null, null, false); - protected final ColumnInfo _columnReplacement = cci("replacement", "replacement", null, null, String.class, "replacement", null, false, false, false, "String", 0, 0, null, false, null, null, null, null, null, false); - protected final ColumnInfo _columnSortOrder = cci("sortOrder", "sortOrder", null, null, Integer.class, "sortOrder", null, false, false, false, "Integer", 0, 0, null, false, null, null, null, null, null, false); - protected final ColumnInfo _columnUpdatedBy = cci("updatedBy", "updatedBy", null, null, String.class, "updatedBy", null, false, false, false, "String", 0, 0, null, false, null, null, null, null, null, false); - protected final ColumnInfo _columnUpdatedTime = cci("updatedTime", "updatedTime", null, null, Long.class, "updatedTime", null, false, false, false, "Long", 0, 0, null, false, null, null, null, null, null, false); + protected final ColumnInfo _columnCreatedBy = cci("createdBy", "createdBy", null, null, String.class, "createdBy", null, false, false, + false, "String", 0, 0, null, false, null, null, null, null, null, false); + protected final ColumnInfo _columnCreatedTime = cci("createdTime", "createdTime", null, null, Long.class, "createdTime", null, false, + false, false, "Long", 0, 0, null, false, null, null, null, null, null, false); + protected final ColumnInfo _columnProcessType = cci("processType", "processType", null, null, String.class, "processType", null, false, + false, false, "String", 0, 0, null, false, null, null, null, null, null, false); + protected final ColumnInfo _columnRegex = cci("regex", "regex", null, null, String.class, "regex", null, false, false, false, "String", + 0, 0, null, false, null, null, null, null, null, false); + protected final ColumnInfo _columnReplacement = cci("replacement", "replacement", null, null, String.class, "replacement", null, false, + false, false, "String", 0, 0, null, false, null, null, null, null, null, false); + protected final ColumnInfo _columnSortOrder = cci("sortOrder", "sortOrder", null, null, Integer.class, "sortOrder", null, false, false, + false, "Integer", 0, 0, null, false, null, null, null, null, null, false); + protected final ColumnInfo _columnUpdatedBy = cci("updatedBy", "updatedBy", null, null, String.class, "updatedBy", null, false, false, + false, "String", 0, 0, null, false, null, null, null, null, null, false); + protected final ColumnInfo _columnUpdatedTime = cci("updatedTime", "updatedTime", null, null, Long.class, "updatedTime", null, false, + false, false, "Long", 0, 0, null, false, null, null, null, null, null, false); - public ColumnInfo columnCreatedBy() { return _columnCreatedBy; } - public ColumnInfo columnCreatedTime() { return _columnCreatedTime; } - public ColumnInfo columnProcessType() { return _columnProcessType; } - public ColumnInfo columnRegex() { return _columnRegex; } - public ColumnInfo columnReplacement() { return _columnReplacement; } - public ColumnInfo columnSortOrder() { return _columnSortOrder; } - public ColumnInfo columnUpdatedBy() { return _columnUpdatedBy; } - public ColumnInfo columnUpdatedTime() { return _columnUpdatedTime; } + public ColumnInfo columnCreatedBy() { + return _columnCreatedBy; + } + + public ColumnInfo columnCreatedTime() { + return _columnCreatedTime; + } + + public ColumnInfo columnProcessType() { + return _columnProcessType; + } + + public ColumnInfo columnRegex() { + return _columnRegex; + } + + public ColumnInfo columnReplacement() { + return _columnReplacement; + } + + public ColumnInfo columnSortOrder() { + return _columnSortOrder; + } + + public ColumnInfo columnUpdatedBy() { + return _columnUpdatedBy; + } + + public ColumnInfo columnUpdatedTime() { + return _columnUpdatedTime; + } protected List ccil() { List ls = newArrayList(); @@ -216,4 +265,3 @@ public class PathMappingDbm extends AbstractDBMeta { return null; } } - diff --git a/src/main/java/org/codelibs/fess/es/config/bsentity/dbmeta/RequestHeaderDbm.java b/src/main/java/org/codelibs/fess/es/config/bsentity/dbmeta/RequestHeaderDbm.java index 0f796dfbb..10a5bf619 100644 --- a/src/main/java/org/codelibs/fess/es/config/bsentity/dbmeta/RequestHeaderDbm.java +++ b/src/main/java/org/codelibs/fess/es/config/bsentity/dbmeta/RequestHeaderDbm.java @@ -15,12 +15,11 @@ */ package org.codelibs.fess.es.config.bsentity.dbmeta; -import java.time.*; +import java.time.LocalDateTime; 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; @@ -80,13 +79,19 @@ public class RequestHeaderDbm extends AbstractDBMeta { // --------------- protected final Map _epgMap = newHashMap(); { - setupEpg(_epgMap, et-> ((RequestHeader)et).getCreatedBy(),(et,vl)->((RequestHeader) et).setCreatedBy(DfTypeUtil.toString(vl)), "createdBy"); - setupEpg(_epgMap, et-> ((RequestHeader)et).getCreatedTime(),(et,vl)->((RequestHeader) et).setCreatedTime(DfTypeUtil.toLong(vl)), "createdTime"); - setupEpg(_epgMap, et-> ((RequestHeader)et).getName(),(et,vl)->((RequestHeader) et).setName(DfTypeUtil.toString(vl)), "name"); - setupEpg(_epgMap, et-> ((RequestHeader)et).getUpdatedBy(),(et,vl)->((RequestHeader) et).setUpdatedBy(DfTypeUtil.toString(vl)), "updatedBy"); - setupEpg(_epgMap, et-> ((RequestHeader)et).getUpdatedTime(),(et,vl)->((RequestHeader) et).setUpdatedTime(DfTypeUtil.toLong(vl)), "updatedTime"); - setupEpg(_epgMap, et-> ((RequestHeader)et).getValue(),(et,vl)->((RequestHeader) et).setValue(DfTypeUtil.toString(vl)), "value"); - setupEpg(_epgMap, et-> ((RequestHeader)et).getWebConfigId(),(et,vl)->((RequestHeader) et).setWebConfigId(DfTypeUtil.toString(vl)), "webConfigId"); + setupEpg(_epgMap, et -> ((RequestHeader) et).getCreatedBy(), + (et, vl) -> ((RequestHeader) et).setCreatedBy(DfTypeUtil.toString(vl)), "createdBy"); + setupEpg(_epgMap, et -> ((RequestHeader) et).getCreatedTime(), + (et, vl) -> ((RequestHeader) et).setCreatedTime(DfTypeUtil.toLong(vl)), "createdTime"); + setupEpg(_epgMap, et -> ((RequestHeader) et).getName(), (et, vl) -> ((RequestHeader) et).setName(DfTypeUtil.toString(vl)), "name"); + setupEpg(_epgMap, et -> ((RequestHeader) et).getUpdatedBy(), + (et, vl) -> ((RequestHeader) et).setUpdatedBy(DfTypeUtil.toString(vl)), "updatedBy"); + setupEpg(_epgMap, et -> ((RequestHeader) et).getUpdatedTime(), + (et, vl) -> ((RequestHeader) et).setUpdatedTime(DfTypeUtil.toLong(vl)), "updatedTime"); + setupEpg(_epgMap, et -> ((RequestHeader) et).getValue(), (et, vl) -> ((RequestHeader) et).setValue(DfTypeUtil.toString(vl)), + "value"); + setupEpg(_epgMap, et -> ((RequestHeader) et).getWebConfigId(), + (et, vl) -> ((RequestHeader) et).setWebConfigId(DfTypeUtil.toString(vl)), "webConfigId"); } @Override @@ -100,32 +105,71 @@ public class RequestHeaderDbm extends AbstractDBMeta { protected final String _tableDbName = "request_header"; protected final String _tableDispName = "request_header"; protected final String _tablePropertyName = "RequestHeader"; - public String getTableDbName() { return _tableDbName; } + + public String getTableDbName() { + return _tableDbName; + } + @Override - public String getTableDispName() { return _tableDispName; } + public String getTableDispName() { + return _tableDispName; + } + @Override - public String getTablePropertyName() { return _tablePropertyName; } + public String getTablePropertyName() { + return _tablePropertyName; + } + @Override - public TableSqlName getTableSqlName() { return null; } + public TableSqlName getTableSqlName() { + return null; + } // =================================================================================== // Column Info // =========== - protected final ColumnInfo _columnCreatedBy = cci("createdBy", "createdBy", null, null, String.class, "createdBy", null, false, false, false, "String", 0, 0, null, false, null, null, null, null, null, false); - protected final ColumnInfo _columnCreatedTime = cci("createdTime", "createdTime", null, null, Long.class, "createdTime", null, false, false, false, "Long", 0, 0, null, false, null, null, null, null, null, false); - protected final ColumnInfo _columnName = cci("name", "name", null, null, String.class, "name", null, false, false, false, "String", 0, 0, null, false, null, null, null, null, null, false); - protected final ColumnInfo _columnUpdatedBy = cci("updatedBy", "updatedBy", null, null, String.class, "updatedBy", null, false, false, false, "String", 0, 0, null, false, null, null, null, null, null, false); - protected final ColumnInfo _columnUpdatedTime = cci("updatedTime", "updatedTime", null, null, Long.class, "updatedTime", null, false, false, false, "Long", 0, 0, null, false, null, null, null, null, null, false); - protected final ColumnInfo _columnValue = cci("value", "value", null, null, String.class, "value", null, false, false, false, "String", 0, 0, null, false, null, null, null, null, null, false); - protected final ColumnInfo _columnWebConfigId = cci("webConfigId", "webConfigId", null, null, String.class, "webConfigId", null, false, false, false, "String", 0, 0, null, false, null, null, null, null, null, false); + protected final ColumnInfo _columnCreatedBy = cci("createdBy", "createdBy", null, null, String.class, "createdBy", null, false, false, + false, "String", 0, 0, null, false, null, null, null, null, null, false); + protected final ColumnInfo _columnCreatedTime = cci("createdTime", "createdTime", null, null, Long.class, "createdTime", null, false, + false, false, "Long", 0, 0, null, false, null, null, null, null, null, false); + protected final ColumnInfo _columnName = cci("name", "name", null, null, String.class, "name", null, false, false, false, "String", 0, + 0, null, false, null, null, null, null, null, false); + protected final ColumnInfo _columnUpdatedBy = cci("updatedBy", "updatedBy", null, null, String.class, "updatedBy", null, false, false, + false, "String", 0, 0, null, false, null, null, null, null, null, false); + protected final ColumnInfo _columnUpdatedTime = cci("updatedTime", "updatedTime", null, null, Long.class, "updatedTime", null, false, + false, false, "Long", 0, 0, null, false, null, null, null, null, null, false); + protected final ColumnInfo _columnValue = cci("value", "value", null, null, String.class, "value", null, false, false, false, "String", + 0, 0, null, false, null, null, null, null, null, false); + protected final ColumnInfo _columnWebConfigId = cci("webConfigId", "webConfigId", null, null, String.class, "webConfigId", null, false, + false, false, "String", 0, 0, null, false, null, null, null, null, null, false); - public ColumnInfo columnCreatedBy() { return _columnCreatedBy; } - public ColumnInfo columnCreatedTime() { return _columnCreatedTime; } - public ColumnInfo columnName() { return _columnName; } - public ColumnInfo columnUpdatedBy() { return _columnUpdatedBy; } - public ColumnInfo columnUpdatedTime() { return _columnUpdatedTime; } - public ColumnInfo columnValue() { return _columnValue; } - public ColumnInfo columnWebConfigId() { return _columnWebConfigId; } + public ColumnInfo columnCreatedBy() { + return _columnCreatedBy; + } + + public ColumnInfo columnCreatedTime() { + return _columnCreatedTime; + } + + public ColumnInfo columnName() { + return _columnName; + } + + public ColumnInfo columnUpdatedBy() { + return _columnUpdatedBy; + } + + public ColumnInfo columnUpdatedTime() { + return _columnUpdatedTime; + } + + public ColumnInfo columnValue() { + return _columnValue; + } + + public ColumnInfo columnWebConfigId() { + return _columnWebConfigId; + } protected List ccil() { List ls = newArrayList(); @@ -212,4 +256,3 @@ public class RequestHeaderDbm extends AbstractDBMeta { return null; } } - diff --git a/src/main/java/org/codelibs/fess/es/config/bsentity/dbmeta/RoleTypeDbm.java b/src/main/java/org/codelibs/fess/es/config/bsentity/dbmeta/RoleTypeDbm.java index 6e7fe6dde..b533925a2 100644 --- a/src/main/java/org/codelibs/fess/es/config/bsentity/dbmeta/RoleTypeDbm.java +++ b/src/main/java/org/codelibs/fess/es/config/bsentity/dbmeta/RoleTypeDbm.java @@ -15,12 +15,11 @@ */ package org.codelibs.fess.es.config.bsentity.dbmeta; -import java.time.*; +import java.time.LocalDateTime; 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; @@ -80,13 +79,18 @@ public class RoleTypeDbm extends AbstractDBMeta { // --------------- protected final Map _epgMap = newHashMap(); { - setupEpg(_epgMap, et-> ((RoleType)et).getCreatedBy(),(et,vl)->((RoleType) et).setCreatedBy(DfTypeUtil.toString(vl)), "createdBy"); - setupEpg(_epgMap, et-> ((RoleType)et).getCreatedTime(),(et,vl)->((RoleType) et).setCreatedTime(DfTypeUtil.toLong(vl)), "createdTime"); - setupEpg(_epgMap, et-> ((RoleType)et).getName(),(et,vl)->((RoleType) et).setName(DfTypeUtil.toString(vl)), "name"); - setupEpg(_epgMap, et-> ((RoleType)et).getSortOrder(),(et,vl)->((RoleType) et).setSortOrder(DfTypeUtil.toInteger(vl)), "sortOrder"); - setupEpg(_epgMap, et-> ((RoleType)et).getUpdatedBy(),(et,vl)->((RoleType) et).setUpdatedBy(DfTypeUtil.toString(vl)), "updatedBy"); - setupEpg(_epgMap, et-> ((RoleType)et).getUpdatedTime(),(et,vl)->((RoleType) et).setUpdatedTime(DfTypeUtil.toLong(vl)), "updatedTime"); - setupEpg(_epgMap, et-> ((RoleType)et).getValue(),(et,vl)->((RoleType) et).setValue(DfTypeUtil.toString(vl)), "value"); + setupEpg(_epgMap, et -> ((RoleType) et).getCreatedBy(), (et, vl) -> ((RoleType) et).setCreatedBy(DfTypeUtil.toString(vl)), + "createdBy"); + setupEpg(_epgMap, et -> ((RoleType) et).getCreatedTime(), (et, vl) -> ((RoleType) et).setCreatedTime(DfTypeUtil.toLong(vl)), + "createdTime"); + setupEpg(_epgMap, et -> ((RoleType) et).getName(), (et, vl) -> ((RoleType) et).setName(DfTypeUtil.toString(vl)), "name"); + setupEpg(_epgMap, et -> ((RoleType) et).getSortOrder(), (et, vl) -> ((RoleType) et).setSortOrder(DfTypeUtil.toInteger(vl)), + "sortOrder"); + setupEpg(_epgMap, et -> ((RoleType) et).getUpdatedBy(), (et, vl) -> ((RoleType) et).setUpdatedBy(DfTypeUtil.toString(vl)), + "updatedBy"); + setupEpg(_epgMap, et -> ((RoleType) et).getUpdatedTime(), (et, vl) -> ((RoleType) et).setUpdatedTime(DfTypeUtil.toLong(vl)), + "updatedTime"); + setupEpg(_epgMap, et -> ((RoleType) et).getValue(), (et, vl) -> ((RoleType) et).setValue(DfTypeUtil.toString(vl)), "value"); } @Override @@ -100,32 +104,71 @@ public class RoleTypeDbm extends AbstractDBMeta { protected final String _tableDbName = "role_type"; protected final String _tableDispName = "role_type"; protected final String _tablePropertyName = "RoleType"; - public String getTableDbName() { return _tableDbName; } + + public String getTableDbName() { + return _tableDbName; + } + @Override - public String getTableDispName() { return _tableDispName; } + public String getTableDispName() { + return _tableDispName; + } + @Override - public String getTablePropertyName() { return _tablePropertyName; } + public String getTablePropertyName() { + return _tablePropertyName; + } + @Override - public TableSqlName getTableSqlName() { return null; } + public TableSqlName getTableSqlName() { + return null; + } // =================================================================================== // Column Info // =========== - protected final ColumnInfo _columnCreatedBy = cci("createdBy", "createdBy", null, null, String.class, "createdBy", null, false, false, false, "String", 0, 0, null, false, null, null, null, null, null, false); - protected final ColumnInfo _columnCreatedTime = cci("createdTime", "createdTime", null, null, Long.class, "createdTime", null, false, false, false, "Long", 0, 0, null, false, null, null, null, null, null, false); - protected final ColumnInfo _columnName = cci("name", "name", null, null, String.class, "name", null, false, false, false, "String", 0, 0, null, false, null, null, null, null, null, false); - protected final ColumnInfo _columnSortOrder = cci("sortOrder", "sortOrder", null, null, Integer.class, "sortOrder", null, false, false, false, "Integer", 0, 0, null, false, null, null, null, null, null, false); - protected final ColumnInfo _columnUpdatedBy = cci("updatedBy", "updatedBy", null, null, String.class, "updatedBy", null, false, false, false, "String", 0, 0, null, false, null, null, null, null, null, false); - protected final ColumnInfo _columnUpdatedTime = cci("updatedTime", "updatedTime", null, null, Long.class, "updatedTime", null, false, false, false, "Long", 0, 0, null, false, null, null, null, null, null, false); - protected final ColumnInfo _columnValue = cci("value", "value", null, null, String.class, "value", null, false, false, false, "String", 0, 0, null, false, null, null, null, null, null, false); + protected final ColumnInfo _columnCreatedBy = cci("createdBy", "createdBy", null, null, String.class, "createdBy", null, false, false, + false, "String", 0, 0, null, false, null, null, null, null, null, false); + protected final ColumnInfo _columnCreatedTime = cci("createdTime", "createdTime", null, null, Long.class, "createdTime", null, false, + false, false, "Long", 0, 0, null, false, null, null, null, null, null, false); + protected final ColumnInfo _columnName = cci("name", "name", null, null, String.class, "name", null, false, false, false, "String", 0, + 0, null, false, null, null, null, null, null, false); + protected final ColumnInfo _columnSortOrder = cci("sortOrder", "sortOrder", null, null, Integer.class, "sortOrder", null, false, false, + false, "Integer", 0, 0, null, false, null, null, null, null, null, false); + protected final ColumnInfo _columnUpdatedBy = cci("updatedBy", "updatedBy", null, null, String.class, "updatedBy", null, false, false, + false, "String", 0, 0, null, false, null, null, null, null, null, false); + protected final ColumnInfo _columnUpdatedTime = cci("updatedTime", "updatedTime", null, null, Long.class, "updatedTime", null, false, + false, false, "Long", 0, 0, null, false, null, null, null, null, null, false); + protected final ColumnInfo _columnValue = cci("value", "value", null, null, String.class, "value", null, false, false, false, "String", + 0, 0, null, false, null, null, null, null, null, false); - public ColumnInfo columnCreatedBy() { return _columnCreatedBy; } - public ColumnInfo columnCreatedTime() { return _columnCreatedTime; } - public ColumnInfo columnName() { return _columnName; } - public ColumnInfo columnSortOrder() { return _columnSortOrder; } - public ColumnInfo columnUpdatedBy() { return _columnUpdatedBy; } - public ColumnInfo columnUpdatedTime() { return _columnUpdatedTime; } - public ColumnInfo columnValue() { return _columnValue; } + public ColumnInfo columnCreatedBy() { + return _columnCreatedBy; + } + + public ColumnInfo columnCreatedTime() { + return _columnCreatedTime; + } + + public ColumnInfo columnName() { + return _columnName; + } + + public ColumnInfo columnSortOrder() { + return _columnSortOrder; + } + + public ColumnInfo columnUpdatedBy() { + return _columnUpdatedBy; + } + + public ColumnInfo columnUpdatedTime() { + return _columnUpdatedTime; + } + + public ColumnInfo columnValue() { + return _columnValue; + } protected List ccil() { List ls = newArrayList(); @@ -212,4 +255,3 @@ public class RoleTypeDbm extends AbstractDBMeta { return null; } } - diff --git a/src/main/java/org/codelibs/fess/es/config/bsentity/dbmeta/ScheduledJobDbm.java b/src/main/java/org/codelibs/fess/es/config/bsentity/dbmeta/ScheduledJobDbm.java index 14424feab..8eb8b1445 100644 --- a/src/main/java/org/codelibs/fess/es/config/bsentity/dbmeta/ScheduledJobDbm.java +++ b/src/main/java/org/codelibs/fess/es/config/bsentity/dbmeta/ScheduledJobDbm.java @@ -15,12 +15,11 @@ */ package org.codelibs.fess.es.config.bsentity.dbmeta; -import java.time.*; +import java.time.LocalDateTime; 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; @@ -80,19 +79,31 @@ public class ScheduledJobDbm extends AbstractDBMeta { // --------------- protected final Map _epgMap = newHashMap(); { - setupEpg(_epgMap, et-> ((ScheduledJob)et).getAvailable(),(et,vl)->((ScheduledJob) et).setAvailable(DfTypeUtil.toBoolean(vl)), "available"); - setupEpg(_epgMap, et-> ((ScheduledJob)et).getCrawler(),(et,vl)->((ScheduledJob) et).setCrawler(DfTypeUtil.toBoolean(vl)), "crawler"); - setupEpg(_epgMap, et-> ((ScheduledJob)et).getCreatedBy(),(et,vl)->((ScheduledJob) et).setCreatedBy(DfTypeUtil.toString(vl)), "createdBy"); - setupEpg(_epgMap, et-> ((ScheduledJob)et).getCreatedTime(),(et,vl)->((ScheduledJob) et).setCreatedTime(DfTypeUtil.toLong(vl)), "createdTime"); - setupEpg(_epgMap, et-> ((ScheduledJob)et).getCronExpression(),(et,vl)->((ScheduledJob) et).setCronExpression(DfTypeUtil.toString(vl)), "cronExpression"); - setupEpg(_epgMap, et-> ((ScheduledJob)et).getJobLogging(),(et,vl)->((ScheduledJob) et).setJobLogging(DfTypeUtil.toBoolean(vl)), "jobLogging"); - setupEpg(_epgMap, et-> ((ScheduledJob)et).getName(),(et,vl)->((ScheduledJob) et).setName(DfTypeUtil.toString(vl)), "name"); - setupEpg(_epgMap, et-> ((ScheduledJob)et).getScriptData(),(et,vl)->((ScheduledJob) et).setScriptData(DfTypeUtil.toString(vl)), "scriptData"); - setupEpg(_epgMap, et-> ((ScheduledJob)et).getScriptType(),(et,vl)->((ScheduledJob) et).setScriptType(DfTypeUtil.toString(vl)), "scriptType"); - setupEpg(_epgMap, et-> ((ScheduledJob)et).getSortOrder(),(et,vl)->((ScheduledJob) et).setSortOrder(DfTypeUtil.toInteger(vl)), "sortOrder"); - setupEpg(_epgMap, et-> ((ScheduledJob)et).getTarget(),(et,vl)->((ScheduledJob) et).setTarget(DfTypeUtil.toString(vl)), "target"); - setupEpg(_epgMap, et-> ((ScheduledJob)et).getUpdatedBy(),(et,vl)->((ScheduledJob) et).setUpdatedBy(DfTypeUtil.toString(vl)), "updatedBy"); - setupEpg(_epgMap, et-> ((ScheduledJob)et).getUpdatedTime(),(et,vl)->((ScheduledJob) et).setUpdatedTime(DfTypeUtil.toLong(vl)), "updatedTime"); + setupEpg(_epgMap, et -> ((ScheduledJob) et).getAvailable(), (et, vl) -> ((ScheduledJob) et).setAvailable(DfTypeUtil.toBoolean(vl)), + "available"); + setupEpg(_epgMap, et -> ((ScheduledJob) et).getCrawler(), (et, vl) -> ((ScheduledJob) et).setCrawler(DfTypeUtil.toBoolean(vl)), + "crawler"); + setupEpg(_epgMap, et -> ((ScheduledJob) et).getCreatedBy(), (et, vl) -> ((ScheduledJob) et).setCreatedBy(DfTypeUtil.toString(vl)), + "createdBy"); + setupEpg(_epgMap, et -> ((ScheduledJob) et).getCreatedTime(), + (et, vl) -> ((ScheduledJob) et).setCreatedTime(DfTypeUtil.toLong(vl)), "createdTime"); + setupEpg(_epgMap, et -> ((ScheduledJob) et).getCronExpression(), + (et, vl) -> ((ScheduledJob) et).setCronExpression(DfTypeUtil.toString(vl)), "cronExpression"); + setupEpg(_epgMap, et -> ((ScheduledJob) et).getJobLogging(), + (et, vl) -> ((ScheduledJob) et).setJobLogging(DfTypeUtil.toBoolean(vl)), "jobLogging"); + setupEpg(_epgMap, et -> ((ScheduledJob) et).getName(), (et, vl) -> ((ScheduledJob) et).setName(DfTypeUtil.toString(vl)), "name"); + setupEpg(_epgMap, et -> ((ScheduledJob) et).getScriptData(), + (et, vl) -> ((ScheduledJob) et).setScriptData(DfTypeUtil.toString(vl)), "scriptData"); + setupEpg(_epgMap, et -> ((ScheduledJob) et).getScriptType(), + (et, vl) -> ((ScheduledJob) et).setScriptType(DfTypeUtil.toString(vl)), "scriptType"); + setupEpg(_epgMap, et -> ((ScheduledJob) et).getSortOrder(), (et, vl) -> ((ScheduledJob) et).setSortOrder(DfTypeUtil.toInteger(vl)), + "sortOrder"); + setupEpg(_epgMap, et -> ((ScheduledJob) et).getTarget(), (et, vl) -> ((ScheduledJob) et).setTarget(DfTypeUtil.toString(vl)), + "target"); + setupEpg(_epgMap, et -> ((ScheduledJob) et).getUpdatedBy(), (et, vl) -> ((ScheduledJob) et).setUpdatedBy(DfTypeUtil.toString(vl)), + "updatedBy"); + setupEpg(_epgMap, et -> ((ScheduledJob) et).getUpdatedTime(), + (et, vl) -> ((ScheduledJob) et).setUpdatedTime(DfTypeUtil.toLong(vl)), "updatedTime"); } @Override @@ -106,44 +117,107 @@ public class ScheduledJobDbm extends AbstractDBMeta { protected final String _tableDbName = "scheduled_job"; protected final String _tableDispName = "scheduled_job"; protected final String _tablePropertyName = "ScheduledJob"; - public String getTableDbName() { return _tableDbName; } + + public String getTableDbName() { + return _tableDbName; + } + @Override - public String getTableDispName() { return _tableDispName; } + public String getTableDispName() { + return _tableDispName; + } + @Override - public String getTablePropertyName() { return _tablePropertyName; } + public String getTablePropertyName() { + return _tablePropertyName; + } + @Override - public TableSqlName getTableSqlName() { return null; } + public TableSqlName getTableSqlName() { + return null; + } // =================================================================================== // Column Info // =========== - protected final ColumnInfo _columnAvailable = cci("available", "available", null, null, Boolean.class, "available", null, false, false, false, "Boolean", 0, 0, null, false, null, null, null, null, null, false); - protected final ColumnInfo _columnCrawler = cci("crawler", "crawler", null, null, Boolean.class, "crawler", null, false, false, false, "Boolean", 0, 0, null, false, null, null, null, null, null, false); - protected final ColumnInfo _columnCreatedBy = cci("createdBy", "createdBy", null, null, String.class, "createdBy", null, false, false, false, "String", 0, 0, null, false, null, null, null, null, null, false); - protected final ColumnInfo _columnCreatedTime = cci("createdTime", "createdTime", null, null, Long.class, "createdTime", null, false, false, false, "Long", 0, 0, null, false, null, null, null, null, null, false); - protected final ColumnInfo _columnCronExpression = cci("cronExpression", "cronExpression", null, null, String.class, "cronExpression", null, false, false, false, "String", 0, 0, null, false, null, null, null, null, null, false); - protected final ColumnInfo _columnJobLogging = cci("jobLogging", "jobLogging", null, null, Boolean.class, "jobLogging", null, false, false, false, "Boolean", 0, 0, null, false, null, null, null, null, null, false); - protected final ColumnInfo _columnName = cci("name", "name", null, null, String.class, "name", null, false, false, false, "String", 0, 0, null, false, null, null, null, null, null, false); - protected final ColumnInfo _columnScriptData = cci("scriptData", "scriptData", null, null, String.class, "scriptData", null, false, false, false, "String", 0, 0, null, false, null, null, null, null, null, false); - protected final ColumnInfo _columnScriptType = cci("scriptType", "scriptType", null, null, String.class, "scriptType", null, false, false, false, "String", 0, 0, null, false, null, null, null, null, null, false); - protected final ColumnInfo _columnSortOrder = cci("sortOrder", "sortOrder", null, null, Integer.class, "sortOrder", null, false, false, false, "Integer", 0, 0, null, false, null, null, null, null, null, false); - protected final ColumnInfo _columnTarget = cci("target", "target", null, null, String.class, "target", null, false, false, false, "String", 0, 0, null, false, null, null, null, null, null, false); - protected final ColumnInfo _columnUpdatedBy = cci("updatedBy", "updatedBy", null, null, String.class, "updatedBy", null, false, false, false, "String", 0, 0, null, false, null, null, null, null, null, false); - protected final ColumnInfo _columnUpdatedTime = cci("updatedTime", "updatedTime", null, null, Long.class, "updatedTime", null, false, false, false, "Long", 0, 0, null, false, null, null, null, null, null, false); + protected final ColumnInfo _columnAvailable = cci("available", "available", null, null, Boolean.class, "available", null, false, false, + false, "Boolean", 0, 0, null, false, null, null, null, null, null, false); + protected final ColumnInfo _columnCrawler = cci("crawler", "crawler", null, null, Boolean.class, "crawler", null, false, false, false, + "Boolean", 0, 0, null, false, null, null, null, null, null, false); + protected final ColumnInfo _columnCreatedBy = cci("createdBy", "createdBy", null, null, String.class, "createdBy", null, false, false, + false, "String", 0, 0, null, false, null, null, null, null, null, false); + protected final ColumnInfo _columnCreatedTime = cci("createdTime", "createdTime", null, null, Long.class, "createdTime", null, false, + false, false, "Long", 0, 0, null, false, null, null, null, null, null, false); + protected final ColumnInfo _columnCronExpression = cci("cronExpression", "cronExpression", null, null, String.class, "cronExpression", + null, false, false, false, "String", 0, 0, null, false, null, null, null, null, null, false); + protected final ColumnInfo _columnJobLogging = cci("jobLogging", "jobLogging", null, null, Boolean.class, "jobLogging", null, false, + false, false, "Boolean", 0, 0, null, false, null, null, null, null, null, false); + protected final ColumnInfo _columnName = cci("name", "name", null, null, String.class, "name", null, false, false, false, "String", 0, + 0, null, false, null, null, null, null, null, false); + protected final ColumnInfo _columnScriptData = cci("scriptData", "scriptData", null, null, String.class, "scriptData", null, false, + false, false, "String", 0, 0, null, false, null, null, null, null, null, false); + protected final ColumnInfo _columnScriptType = cci("scriptType", "scriptType", null, null, String.class, "scriptType", null, false, + false, false, "String", 0, 0, null, false, null, null, null, null, null, false); + protected final ColumnInfo _columnSortOrder = cci("sortOrder", "sortOrder", null, null, Integer.class, "sortOrder", null, false, false, + false, "Integer", 0, 0, null, false, null, null, null, null, null, false); + protected final ColumnInfo _columnTarget = cci("target", "target", null, null, String.class, "target", null, false, false, false, + "String", 0, 0, null, false, null, null, null, null, null, false); + protected final ColumnInfo _columnUpdatedBy = cci("updatedBy", "updatedBy", null, null, String.class, "updatedBy", null, false, false, + false, "String", 0, 0, null, false, null, null, null, null, null, false); + protected final ColumnInfo _columnUpdatedTime = cci("updatedTime", "updatedTime", null, null, Long.class, "updatedTime", null, false, + false, false, "Long", 0, 0, null, false, null, null, null, null, null, false); - public ColumnInfo columnAvailable() { return _columnAvailable; } - public ColumnInfo columnCrawler() { return _columnCrawler; } - public ColumnInfo columnCreatedBy() { return _columnCreatedBy; } - public ColumnInfo columnCreatedTime() { return _columnCreatedTime; } - public ColumnInfo columnCronExpression() { return _columnCronExpression; } - public ColumnInfo columnJobLogging() { return _columnJobLogging; } - public ColumnInfo columnName() { return _columnName; } - public ColumnInfo columnScriptData() { return _columnScriptData; } - public ColumnInfo columnScriptType() { return _columnScriptType; } - public ColumnInfo columnSortOrder() { return _columnSortOrder; } - public ColumnInfo columnTarget() { return _columnTarget; } - public ColumnInfo columnUpdatedBy() { return _columnUpdatedBy; } - public ColumnInfo columnUpdatedTime() { return _columnUpdatedTime; } + public ColumnInfo columnAvailable() { + return _columnAvailable; + } + + public ColumnInfo columnCrawler() { + return _columnCrawler; + } + + public ColumnInfo columnCreatedBy() { + return _columnCreatedBy; + } + + public ColumnInfo columnCreatedTime() { + return _columnCreatedTime; + } + + public ColumnInfo columnCronExpression() { + return _columnCronExpression; + } + + public ColumnInfo columnJobLogging() { + return _columnJobLogging; + } + + public ColumnInfo columnName() { + return _columnName; + } + + public ColumnInfo columnScriptData() { + return _columnScriptData; + } + + public ColumnInfo columnScriptType() { + return _columnScriptType; + } + + public ColumnInfo columnSortOrder() { + return _columnSortOrder; + } + + public ColumnInfo columnTarget() { + return _columnTarget; + } + + public ColumnInfo columnUpdatedBy() { + return _columnUpdatedBy; + } + + public ColumnInfo columnUpdatedTime() { + return _columnUpdatedTime; + } protected List ccil() { List ls = newArrayList(); @@ -236,4 +310,3 @@ public class ScheduledJobDbm extends AbstractDBMeta { return null; } } - diff --git a/src/main/java/org/codelibs/fess/es/config/bsentity/dbmeta/WebAuthenticationDbm.java b/src/main/java/org/codelibs/fess/es/config/bsentity/dbmeta/WebAuthenticationDbm.java index 6ace5d4ad..17630cded 100644 --- a/src/main/java/org/codelibs/fess/es/config/bsentity/dbmeta/WebAuthenticationDbm.java +++ b/src/main/java/org/codelibs/fess/es/config/bsentity/dbmeta/WebAuthenticationDbm.java @@ -15,12 +15,11 @@ */ package org.codelibs.fess.es.config.bsentity.dbmeta; -import java.time.*; +import java.time.LocalDateTime; 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; @@ -80,18 +79,30 @@ public class WebAuthenticationDbm extends AbstractDBMeta { // --------------- protected final Map _epgMap = newHashMap(); { - setupEpg(_epgMap, et-> ((WebAuthentication)et).getAuthRealm(),(et,vl)->((WebAuthentication) et).setAuthRealm(DfTypeUtil.toString(vl)), "authRealm"); - setupEpg(_epgMap, et-> ((WebAuthentication)et).getCreatedBy(),(et,vl)->((WebAuthentication) et).setCreatedBy(DfTypeUtil.toString(vl)), "createdBy"); - setupEpg(_epgMap, et-> ((WebAuthentication)et).getCreatedTime(),(et,vl)->((WebAuthentication) et).setCreatedTime(DfTypeUtil.toLong(vl)), "createdTime"); - setupEpg(_epgMap, et-> ((WebAuthentication)et).getHostname(),(et,vl)->((WebAuthentication) et).setHostname(DfTypeUtil.toString(vl)), "hostname"); - setupEpg(_epgMap, et-> ((WebAuthentication)et).getParameters(),(et,vl)->((WebAuthentication) et).setParameters(DfTypeUtil.toString(vl)), "parameters"); - setupEpg(_epgMap, et-> ((WebAuthentication)et).getPassword(),(et,vl)->((WebAuthentication) et).setPassword(DfTypeUtil.toString(vl)), "password"); - setupEpg(_epgMap, et-> ((WebAuthentication)et).getPort(),(et,vl)->((WebAuthentication) et).setPort(DfTypeUtil.toInteger(vl)), "port"); - setupEpg(_epgMap, et-> ((WebAuthentication)et).getProtocolScheme(),(et,vl)->((WebAuthentication) et).setProtocolScheme(DfTypeUtil.toString(vl)), "protocolScheme"); - setupEpg(_epgMap, et-> ((WebAuthentication)et).getUpdatedBy(),(et,vl)->((WebAuthentication) et).setUpdatedBy(DfTypeUtil.toString(vl)), "updatedBy"); - setupEpg(_epgMap, et-> ((WebAuthentication)et).getUpdatedTime(),(et,vl)->((WebAuthentication) et).setUpdatedTime(DfTypeUtil.toLong(vl)), "updatedTime"); - setupEpg(_epgMap, et-> ((WebAuthentication)et).getUsername(),(et,vl)->((WebAuthentication) et).setUsername(DfTypeUtil.toString(vl)), "username"); - setupEpg(_epgMap, et-> ((WebAuthentication)et).getWebConfigId(),(et,vl)->((WebAuthentication) et).setWebConfigId(DfTypeUtil.toString(vl)), "webConfigId"); + setupEpg(_epgMap, et -> ((WebAuthentication) et).getAuthRealm(), + (et, vl) -> ((WebAuthentication) et).setAuthRealm(DfTypeUtil.toString(vl)), "authRealm"); + setupEpg(_epgMap, et -> ((WebAuthentication) et).getCreatedBy(), + (et, vl) -> ((WebAuthentication) et).setCreatedBy(DfTypeUtil.toString(vl)), "createdBy"); + setupEpg(_epgMap, et -> ((WebAuthentication) et).getCreatedTime(), + (et, vl) -> ((WebAuthentication) et).setCreatedTime(DfTypeUtil.toLong(vl)), "createdTime"); + setupEpg(_epgMap, et -> ((WebAuthentication) et).getHostname(), + (et, vl) -> ((WebAuthentication) et).setHostname(DfTypeUtil.toString(vl)), "hostname"); + setupEpg(_epgMap, et -> ((WebAuthentication) et).getParameters(), + (et, vl) -> ((WebAuthentication) et).setParameters(DfTypeUtil.toString(vl)), "parameters"); + setupEpg(_epgMap, et -> ((WebAuthentication) et).getPassword(), + (et, vl) -> ((WebAuthentication) et).setPassword(DfTypeUtil.toString(vl)), "password"); + setupEpg(_epgMap, et -> ((WebAuthentication) et).getPort(), (et, vl) -> ((WebAuthentication) et).setPort(DfTypeUtil.toInteger(vl)), + "port"); + setupEpg(_epgMap, et -> ((WebAuthentication) et).getProtocolScheme(), + (et, vl) -> ((WebAuthentication) et).setProtocolScheme(DfTypeUtil.toString(vl)), "protocolScheme"); + setupEpg(_epgMap, et -> ((WebAuthentication) et).getUpdatedBy(), + (et, vl) -> ((WebAuthentication) et).setUpdatedBy(DfTypeUtil.toString(vl)), "updatedBy"); + setupEpg(_epgMap, et -> ((WebAuthentication) et).getUpdatedTime(), + (et, vl) -> ((WebAuthentication) et).setUpdatedTime(DfTypeUtil.toLong(vl)), "updatedTime"); + setupEpg(_epgMap, et -> ((WebAuthentication) et).getUsername(), + (et, vl) -> ((WebAuthentication) et).setUsername(DfTypeUtil.toString(vl)), "username"); + setupEpg(_epgMap, et -> ((WebAuthentication) et).getWebConfigId(), + (et, vl) -> ((WebAuthentication) et).setWebConfigId(DfTypeUtil.toString(vl)), "webConfigId"); } @Override @@ -105,42 +116,101 @@ public class WebAuthenticationDbm extends AbstractDBMeta { protected final String _tableDbName = "web_authentication"; protected final String _tableDispName = "web_authentication"; protected final String _tablePropertyName = "WebAuthentication"; - public String getTableDbName() { return _tableDbName; } + + public String getTableDbName() { + return _tableDbName; + } + @Override - public String getTableDispName() { return _tableDispName; } + public String getTableDispName() { + return _tableDispName; + } + @Override - public String getTablePropertyName() { return _tablePropertyName; } + public String getTablePropertyName() { + return _tablePropertyName; + } + @Override - public TableSqlName getTableSqlName() { return null; } + public TableSqlName getTableSqlName() { + return null; + } // =================================================================================== // Column Info // =========== - protected final ColumnInfo _columnAuthRealm = cci("authRealm", "authRealm", null, null, String.class, "authRealm", null, false, false, false, "String", 0, 0, null, false, null, null, null, null, null, false); - protected final ColumnInfo _columnCreatedBy = cci("createdBy", "createdBy", null, null, String.class, "createdBy", null, false, false, false, "String", 0, 0, null, false, null, null, null, null, null, false); - protected final ColumnInfo _columnCreatedTime = cci("createdTime", "createdTime", null, null, Long.class, "createdTime", null, false, false, false, "Long", 0, 0, null, false, null, null, null, null, null, false); - protected final ColumnInfo _columnHostname = cci("hostname", "hostname", null, null, String.class, "hostname", null, false, false, false, "String", 0, 0, null, false, null, null, null, null, null, false); - protected final ColumnInfo _columnParameters = cci("parameters", "parameters", null, null, String.class, "parameters", null, false, false, false, "String", 0, 0, null, false, null, null, null, null, null, false); - protected final ColumnInfo _columnPassword = cci("password", "password", null, null, String.class, "password", null, false, false, false, "String", 0, 0, null, false, null, null, null, null, null, false); - protected final ColumnInfo _columnPort = cci("port", "port", null, null, Integer.class, "port", null, false, false, false, "Integer", 0, 0, null, false, null, null, null, null, null, false); - protected final ColumnInfo _columnProtocolScheme = cci("protocolScheme", "protocolScheme", null, null, String.class, "protocolScheme", null, false, false, false, "String", 0, 0, null, false, null, null, null, null, null, false); - protected final ColumnInfo _columnUpdatedBy = cci("updatedBy", "updatedBy", null, null, String.class, "updatedBy", null, false, false, false, "String", 0, 0, null, false, null, null, null, null, null, false); - protected final ColumnInfo _columnUpdatedTime = cci("updatedTime", "updatedTime", null, null, Long.class, "updatedTime", null, false, false, false, "Long", 0, 0, null, false, null, null, null, null, null, false); - protected final ColumnInfo _columnUsername = cci("username", "username", null, null, String.class, "username", null, false, false, false, "String", 0, 0, null, false, null, null, null, null, null, false); - protected final ColumnInfo _columnWebConfigId = cci("webConfigId", "webConfigId", null, null, String.class, "webConfigId", null, false, false, false, "String", 0, 0, null, false, null, null, null, null, null, false); + protected final ColumnInfo _columnAuthRealm = cci("authRealm", "authRealm", null, null, String.class, "authRealm", null, false, false, + false, "String", 0, 0, null, false, null, null, null, null, null, false); + protected final ColumnInfo _columnCreatedBy = cci("createdBy", "createdBy", null, null, String.class, "createdBy", null, false, false, + false, "String", 0, 0, null, false, null, null, null, null, null, false); + protected final ColumnInfo _columnCreatedTime = cci("createdTime", "createdTime", null, null, Long.class, "createdTime", null, false, + false, false, "Long", 0, 0, null, false, null, null, null, null, null, false); + protected final ColumnInfo _columnHostname = cci("hostname", "hostname", null, null, String.class, "hostname", null, false, false, + false, "String", 0, 0, null, false, null, null, null, null, null, false); + protected final ColumnInfo _columnParameters = cci("parameters", "parameters", null, null, String.class, "parameters", null, false, + false, false, "String", 0, 0, null, false, null, null, null, null, null, false); + protected final ColumnInfo _columnPassword = cci("password", "password", null, null, String.class, "password", null, false, false, + false, "String", 0, 0, null, false, null, null, null, null, null, false); + protected final ColumnInfo _columnPort = cci("port", "port", null, null, Integer.class, "port", null, false, false, false, "Integer", + 0, 0, null, false, null, null, null, null, null, false); + protected final ColumnInfo _columnProtocolScheme = cci("protocolScheme", "protocolScheme", null, null, String.class, "protocolScheme", + null, false, false, false, "String", 0, 0, null, false, null, null, null, null, null, false); + protected final ColumnInfo _columnUpdatedBy = cci("updatedBy", "updatedBy", null, null, String.class, "updatedBy", null, false, false, + false, "String", 0, 0, null, false, null, null, null, null, null, false); + protected final ColumnInfo _columnUpdatedTime = cci("updatedTime", "updatedTime", null, null, Long.class, "updatedTime", null, false, + false, false, "Long", 0, 0, null, false, null, null, null, null, null, false); + protected final ColumnInfo _columnUsername = cci("username", "username", null, null, String.class, "username", null, false, false, + false, "String", 0, 0, null, false, null, null, null, null, null, false); + protected final ColumnInfo _columnWebConfigId = cci("webConfigId", "webConfigId", null, null, String.class, "webConfigId", null, false, + false, false, "String", 0, 0, null, false, null, null, null, null, null, false); - public ColumnInfo columnAuthRealm() { return _columnAuthRealm; } - public ColumnInfo columnCreatedBy() { return _columnCreatedBy; } - public ColumnInfo columnCreatedTime() { return _columnCreatedTime; } - public ColumnInfo columnHostname() { return _columnHostname; } - public ColumnInfo columnParameters() { return _columnParameters; } - public ColumnInfo columnPassword() { return _columnPassword; } - public ColumnInfo columnPort() { return _columnPort; } - public ColumnInfo columnProtocolScheme() { return _columnProtocolScheme; } - public ColumnInfo columnUpdatedBy() { return _columnUpdatedBy; } - public ColumnInfo columnUpdatedTime() { return _columnUpdatedTime; } - public ColumnInfo columnUsername() { return _columnUsername; } - public ColumnInfo columnWebConfigId() { return _columnWebConfigId; } + public ColumnInfo columnAuthRealm() { + return _columnAuthRealm; + } + + public ColumnInfo columnCreatedBy() { + return _columnCreatedBy; + } + + public ColumnInfo columnCreatedTime() { + return _columnCreatedTime; + } + + public ColumnInfo columnHostname() { + return _columnHostname; + } + + public ColumnInfo columnParameters() { + return _columnParameters; + } + + public ColumnInfo columnPassword() { + return _columnPassword; + } + + public ColumnInfo columnPort() { + return _columnPort; + } + + public ColumnInfo columnProtocolScheme() { + return _columnProtocolScheme; + } + + public ColumnInfo columnUpdatedBy() { + return _columnUpdatedBy; + } + + public ColumnInfo columnUpdatedTime() { + return _columnUpdatedTime; + } + + public ColumnInfo columnUsername() { + return _columnUsername; + } + + public ColumnInfo columnWebConfigId() { + return _columnWebConfigId; + } protected List ccil() { List ls = newArrayList(); @@ -232,4 +302,3 @@ public class WebAuthenticationDbm extends AbstractDBMeta { return null; } } - diff --git a/src/main/java/org/codelibs/fess/es/config/bsentity/dbmeta/WebConfigDbm.java b/src/main/java/org/codelibs/fess/es/config/bsentity/dbmeta/WebConfigDbm.java index 2436c77f0..eb3af7260 100644 --- a/src/main/java/org/codelibs/fess/es/config/bsentity/dbmeta/WebConfigDbm.java +++ b/src/main/java/org/codelibs/fess/es/config/bsentity/dbmeta/WebConfigDbm.java @@ -15,12 +15,11 @@ */ package org.codelibs.fess.es.config.bsentity.dbmeta; -import java.time.*; +import java.time.LocalDateTime; 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; @@ -80,27 +79,44 @@ public class WebConfigDbm extends AbstractDBMeta { // --------------- protected final Map _epgMap = newHashMap(); { - setupEpg(_epgMap, et-> ((WebConfig)et).getAvailable(),(et,vl)->((WebConfig) et).setAvailable(DfTypeUtil.toBoolean(vl)), "available"); - setupEpg(_epgMap, et-> ((WebConfig)et).getBoost(),(et,vl)->((WebConfig) et).setBoost(DfTypeUtil.toFloat(vl)), "boost"); - setupEpg(_epgMap, et-> ((WebConfig)et).getConfigParameter(),(et,vl)->((WebConfig) et).setConfigParameter(DfTypeUtil.toString(vl)), "configParameter"); - setupEpg(_epgMap, et-> ((WebConfig)et).getCreatedBy(),(et,vl)->((WebConfig) et).setCreatedBy(DfTypeUtil.toString(vl)), "createdBy"); - setupEpg(_epgMap, et-> ((WebConfig)et).getCreatedTime(),(et,vl)->((WebConfig) et).setCreatedTime(DfTypeUtil.toLong(vl)), "createdTime"); - setupEpg(_epgMap, et-> ((WebConfig)et).getDepth(),(et,vl)->((WebConfig) et).setDepth(DfTypeUtil.toInteger(vl)), "depth"); - setupEpg(_epgMap, et-> ((WebConfig)et).getExcludedDocUrls(),(et,vl)->((WebConfig) et).setExcludedDocUrls(DfTypeUtil.toString(vl)), "excludedDocUrls"); - setupEpg(_epgMap, et-> ((WebConfig)et).getExcludedUrls(),(et,vl)->((WebConfig) et).setExcludedUrls(DfTypeUtil.toString(vl)), "excludedUrls"); - setupEpg(_epgMap, et-> ((WebConfig)et).getIncludedDocUrls(),(et,vl)->((WebConfig) et).setIncludedDocUrls(DfTypeUtil.toString(vl)), "includedDocUrls"); - setupEpg(_epgMap, et-> ((WebConfig)et).getIncludedUrls(),(et,vl)->((WebConfig) et).setIncludedUrls(DfTypeUtil.toString(vl)), "includedUrls"); - setupEpg(_epgMap, et-> ((WebConfig)et).getIntervalTime(),(et,vl)->((WebConfig) et).setIntervalTime(DfTypeUtil.toInteger(vl)), "intervalTime"); - setupEpg(_epgMap, et-> ((WebConfig)et).getTimeToLive(),(et,vl)->((WebConfig) et).setTimeToLive(DfTypeUtil.toInteger(vl)), "timeToLive"); - setupEpg(_epgMap, et-> ((WebConfig)et).getMaxAccessCount(),(et,vl)->((WebConfig) et).setMaxAccessCount(DfTypeUtil.toLong(vl)), "maxAccessCount"); - setupEpg(_epgMap, et-> ((WebConfig)et).getName(),(et,vl)->((WebConfig) et).setName(DfTypeUtil.toString(vl)), "name"); - setupEpg(_epgMap, et-> ((WebConfig)et).getNumOfThread(),(et,vl)->((WebConfig) et).setNumOfThread(DfTypeUtil.toInteger(vl)), "numOfThread"); - setupEpg(_epgMap, et-> ((WebConfig)et).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 @@ -114,60 +130,155 @@ 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); + 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; } + 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 ccil() { List ls = newArrayList(); @@ -268,4 +379,3 @@ public class WebConfigDbm extends AbstractDBMeta { return null; } } - diff --git a/src/main/java/org/codelibs/fess/es/config/bsentity/dbmeta/WebConfigToLabelDbm.java b/src/main/java/org/codelibs/fess/es/config/bsentity/dbmeta/WebConfigToLabelDbm.java index 0d417a90b..64a164bd4 100644 --- a/src/main/java/org/codelibs/fess/es/config/bsentity/dbmeta/WebConfigToLabelDbm.java +++ b/src/main/java/org/codelibs/fess/es/config/bsentity/dbmeta/WebConfigToLabelDbm.java @@ -15,12 +15,11 @@ */ package org.codelibs.fess.es.config.bsentity.dbmeta; -import java.time.*; +import java.time.LocalDateTime; 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; @@ -80,8 +79,10 @@ public class WebConfigToLabelDbm extends AbstractDBMeta { // --------------- protected final Map _epgMap = newHashMap(); { - setupEpg(_epgMap, et-> ((WebConfigToLabel)et).getLabelTypeId(),(et,vl)->((WebConfigToLabel) et).setLabelTypeId(DfTypeUtil.toString(vl)), "labelTypeId"); - setupEpg(_epgMap, et-> ((WebConfigToLabel)et).getWebConfigId(),(et,vl)->((WebConfigToLabel) et).setWebConfigId(DfTypeUtil.toString(vl)), "webConfigId"); + setupEpg(_epgMap, et -> ((WebConfigToLabel) et).getLabelTypeId(), + (et, vl) -> ((WebConfigToLabel) et).setLabelTypeId(DfTypeUtil.toString(vl)), "labelTypeId"); + setupEpg(_epgMap, et -> ((WebConfigToLabel) et).getWebConfigId(), + (et, vl) -> ((WebConfigToLabel) et).setWebConfigId(DfTypeUtil.toString(vl)), "webConfigId"); } @Override @@ -95,22 +96,41 @@ public class WebConfigToLabelDbm extends AbstractDBMeta { protected final String _tableDbName = "web_config_to_label"; protected final String _tableDispName = "web_config_to_label"; protected final String _tablePropertyName = "WebConfigToLabel"; - public String getTableDbName() { return _tableDbName; } + + public String getTableDbName() { + return _tableDbName; + } + @Override - public String getTableDispName() { return _tableDispName; } + public String getTableDispName() { + return _tableDispName; + } + @Override - public String getTablePropertyName() { return _tablePropertyName; } + public String getTablePropertyName() { + return _tablePropertyName; + } + @Override - public TableSqlName getTableSqlName() { return null; } + public TableSqlName getTableSqlName() { + return null; + } // =================================================================================== // Column Info // =========== - protected final ColumnInfo _columnLabelTypeId = cci("labelTypeId", "labelTypeId", null, null, String.class, "labelTypeId", null, false, false, false, "String", 0, 0, null, false, null, null, null, null, null, false); - protected final ColumnInfo _columnWebConfigId = cci("webConfigId", "webConfigId", null, null, String.class, "webConfigId", null, false, false, false, "String", 0, 0, null, false, null, null, null, null, null, false); + protected final ColumnInfo _columnLabelTypeId = cci("labelTypeId", "labelTypeId", null, null, String.class, "labelTypeId", null, false, + false, false, "String", 0, 0, null, false, null, null, null, null, null, false); + protected final ColumnInfo _columnWebConfigId = cci("webConfigId", "webConfigId", null, null, String.class, "webConfigId", null, false, + false, false, "String", 0, 0, null, false, null, null, null, null, null, false); - public ColumnInfo columnLabelTypeId() { return _columnLabelTypeId; } - public ColumnInfo columnWebConfigId() { return _columnWebConfigId; } + public ColumnInfo columnLabelTypeId() { + return _columnLabelTypeId; + } + + public ColumnInfo columnWebConfigId() { + return _columnWebConfigId; + } protected List ccil() { List ls = newArrayList(); @@ -192,4 +212,3 @@ public class WebConfigToLabelDbm extends AbstractDBMeta { return null; } } - diff --git a/src/main/java/org/codelibs/fess/es/config/bsentity/dbmeta/WebConfigToRoleDbm.java b/src/main/java/org/codelibs/fess/es/config/bsentity/dbmeta/WebConfigToRoleDbm.java index 6ef78a857..9572cb229 100644 --- a/src/main/java/org/codelibs/fess/es/config/bsentity/dbmeta/WebConfigToRoleDbm.java +++ b/src/main/java/org/codelibs/fess/es/config/bsentity/dbmeta/WebConfigToRoleDbm.java @@ -15,12 +15,11 @@ */ package org.codelibs.fess.es.config.bsentity.dbmeta; -import java.time.*; +import java.time.LocalDateTime; 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; @@ -80,8 +79,10 @@ public class WebConfigToRoleDbm extends AbstractDBMeta { // --------------- protected final Map _epgMap = newHashMap(); { - setupEpg(_epgMap, et-> ((WebConfigToRole)et).getRoleTypeId(),(et,vl)->((WebConfigToRole) et).setRoleTypeId(DfTypeUtil.toString(vl)), "roleTypeId"); - setupEpg(_epgMap, et-> ((WebConfigToRole)et).getWebConfigId(),(et,vl)->((WebConfigToRole) et).setWebConfigId(DfTypeUtil.toString(vl)), "webConfigId"); + setupEpg(_epgMap, et -> ((WebConfigToRole) et).getRoleTypeId(), + (et, vl) -> ((WebConfigToRole) et).setRoleTypeId(DfTypeUtil.toString(vl)), "roleTypeId"); + setupEpg(_epgMap, et -> ((WebConfigToRole) et).getWebConfigId(), + (et, vl) -> ((WebConfigToRole) et).setWebConfigId(DfTypeUtil.toString(vl)), "webConfigId"); } @Override @@ -95,22 +96,41 @@ public class WebConfigToRoleDbm extends AbstractDBMeta { protected final String _tableDbName = "web_config_to_role"; protected final String _tableDispName = "web_config_to_role"; protected final String _tablePropertyName = "WebConfigToRole"; - public String getTableDbName() { return _tableDbName; } + + public String getTableDbName() { + return _tableDbName; + } + @Override - public String getTableDispName() { return _tableDispName; } + public String getTableDispName() { + return _tableDispName; + } + @Override - public String getTablePropertyName() { return _tablePropertyName; } + public String getTablePropertyName() { + return _tablePropertyName; + } + @Override - public TableSqlName getTableSqlName() { return null; } + public TableSqlName getTableSqlName() { + return null; + } // =================================================================================== // Column Info // =========== - protected final ColumnInfo _columnRoleTypeId = cci("roleTypeId", "roleTypeId", null, null, String.class, "roleTypeId", null, false, false, false, "String", 0, 0, null, false, null, null, null, null, null, false); - protected final ColumnInfo _columnWebConfigId = cci("webConfigId", "webConfigId", null, null, String.class, "webConfigId", null, false, false, false, "String", 0, 0, null, false, null, null, null, null, null, false); + protected final ColumnInfo _columnRoleTypeId = cci("roleTypeId", "roleTypeId", null, null, String.class, "roleTypeId", null, false, + false, false, "String", 0, 0, null, false, null, null, null, null, null, false); + protected final ColumnInfo _columnWebConfigId = cci("webConfigId", "webConfigId", null, null, String.class, "webConfigId", null, false, + false, false, "String", 0, 0, null, false, null, null, null, null, null, false); - public ColumnInfo columnRoleTypeId() { return _columnRoleTypeId; } - public ColumnInfo columnWebConfigId() { return _columnWebConfigId; } + public ColumnInfo columnRoleTypeId() { + return _columnRoleTypeId; + } + + public ColumnInfo columnWebConfigId() { + return _columnWebConfigId; + } protected List ccil() { List ls = newArrayList(); @@ -192,4 +212,3 @@ public class WebConfigToRoleDbm extends AbstractDBMeta { return null; } } - diff --git a/src/main/java/org/codelibs/fess/es/config/cbean/bs/BsBadWordCB.java b/src/main/java/org/codelibs/fess/es/config/cbean/bs/BsBadWordCB.java index 52a015932..97b68a0d3 100644 --- a/src/main/java/org/codelibs/fess/es/config/cbean/bs/BsBadWordCB.java +++ b/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 primaryKeyMap) { - acceptPK((String)primaryKeyMap.get("_id")); + acceptPK((String) primaryKeyMap.get("_id")); } // =================================================================================== @@ -161,21 +161,27 @@ 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"); } diff --git a/src/main/java/org/codelibs/fess/es/config/cbean/bs/BsBoostDocumentRuleCB.java b/src/main/java/org/codelibs/fess/es/config/cbean/bs/BsBoostDocumentRuleCB.java index 51b8f7010..e1305e0cd 100644 --- a/src/main/java/org/codelibs/fess/es/config/cbean/bs/BsBoostDocumentRuleCB.java +++ b/src/main/java/org/codelibs/fess/es/config/cbean/bs/BsBoostDocumentRuleCB.java @@ -75,7 +75,7 @@ public class BsBoostDocumentRuleCB extends EsAbstractConditionBean { @Override public void acceptPrimaryKeyMap(Map primaryKeyMap) { - acceptPK((String)primaryKeyMap.get("_id")); + acceptPK((String) primaryKeyMap.get("_id")); } // =================================================================================== @@ -161,21 +161,27 @@ public class BsBoostDocumentRuleCB extends EsAbstractConditionBean { public void columnBoostExpr() { doColumn("boostExpr"); } + public void columnCreatedBy() { doColumn("createdBy"); } + public void columnCreatedTime() { doColumn("createdTime"); } + public void columnSortOrder() { doColumn("sortOrder"); } + public void columnUpdatedBy() { doColumn("updatedBy"); } + public void columnUpdatedTime() { doColumn("updatedTime"); } + public void columnUrlExpr() { doColumn("urlExpr"); } diff --git a/src/main/java/org/codelibs/fess/es/config/cbean/bs/BsCrawlingInfoCB.java b/src/main/java/org/codelibs/fess/es/config/cbean/bs/BsCrawlingInfoCB.java index 607ca91ca..127d782a8 100644 --- a/src/main/java/org/codelibs/fess/es/config/cbean/bs/BsCrawlingInfoCB.java +++ b/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 primaryKeyMap) { - acceptPK((String)primaryKeyMap.get("_id")); + acceptPK((String) primaryKeyMap.get("_id")); } // =================================================================================== @@ -161,12 +161,15 @@ 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"); } diff --git a/src/main/java/org/codelibs/fess/es/config/cbean/bs/BsCrawlingInfoParamCB.java b/src/main/java/org/codelibs/fess/es/config/cbean/bs/BsCrawlingInfoParamCB.java index f029ba5b8..d23a65c48 100644 --- a/src/main/java/org/codelibs/fess/es/config/cbean/bs/BsCrawlingInfoParamCB.java +++ b/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 primaryKeyMap) { - acceptPK((String)primaryKeyMap.get("_id")); + acceptPK((String) primaryKeyMap.get("_id")); } // =================================================================================== @@ -161,12 +161,15 @@ 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"); } diff --git a/src/main/java/org/codelibs/fess/es/config/cbean/bs/BsDataConfigCB.java b/src/main/java/org/codelibs/fess/es/config/cbean/bs/BsDataConfigCB.java index d3c0052c7..27ed93354 100644 --- a/src/main/java/org/codelibs/fess/es/config/cbean/bs/BsDataConfigCB.java +++ b/src/main/java/org/codelibs/fess/es/config/cbean/bs/BsDataConfigCB.java @@ -75,7 +75,7 @@ public class BsDataConfigCB extends EsAbstractConditionBean { @Override public void acceptPrimaryKeyMap(Map primaryKeyMap) { - acceptPK((String)primaryKeyMap.get("_id")); + acceptPK((String) primaryKeyMap.get("_id")); } // =================================================================================== @@ -161,36 +161,47 @@ 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"); } diff --git a/src/main/java/org/codelibs/fess/es/config/cbean/bs/BsDataConfigToLabelCB.java b/src/main/java/org/codelibs/fess/es/config/cbean/bs/BsDataConfigToLabelCB.java index 8caddbf2c..05e4d91ce 100644 --- a/src/main/java/org/codelibs/fess/es/config/cbean/bs/BsDataConfigToLabelCB.java +++ b/src/main/java/org/codelibs/fess/es/config/cbean/bs/BsDataConfigToLabelCB.java @@ -75,7 +75,7 @@ public class BsDataConfigToLabelCB extends EsAbstractConditionBean { @Override public void acceptPrimaryKeyMap(Map primaryKeyMap) { - acceptPK((String)primaryKeyMap.get("_id")); + acceptPK((String) primaryKeyMap.get("_id")); } // =================================================================================== @@ -161,6 +161,7 @@ public class BsDataConfigToLabelCB extends EsAbstractConditionBean { public void columnDataConfigId() { doColumn("dataConfigId"); } + public void columnLabelTypeId() { doColumn("labelTypeId"); } diff --git a/src/main/java/org/codelibs/fess/es/config/cbean/bs/BsDataConfigToRoleCB.java b/src/main/java/org/codelibs/fess/es/config/cbean/bs/BsDataConfigToRoleCB.java index dc8140660..ebc2d16ef 100644 --- a/src/main/java/org/codelibs/fess/es/config/cbean/bs/BsDataConfigToRoleCB.java +++ b/src/main/java/org/codelibs/fess/es/config/cbean/bs/BsDataConfigToRoleCB.java @@ -75,7 +75,7 @@ public class BsDataConfigToRoleCB extends EsAbstractConditionBean { @Override public void acceptPrimaryKeyMap(Map primaryKeyMap) { - acceptPK((String)primaryKeyMap.get("_id")); + acceptPK((String) primaryKeyMap.get("_id")); } // =================================================================================== @@ -161,6 +161,7 @@ public class BsDataConfigToRoleCB extends EsAbstractConditionBean { public void columnDataConfigId() { doColumn("dataConfigId"); } + public void columnRoleTypeId() { doColumn("roleTypeId"); } diff --git a/src/main/java/org/codelibs/fess/es/config/cbean/bs/BsDuplicateHostCB.java b/src/main/java/org/codelibs/fess/es/config/cbean/bs/BsDuplicateHostCB.java index 582dd5a18..1828e8df7 100644 --- a/src/main/java/org/codelibs/fess/es/config/cbean/bs/BsDuplicateHostCB.java +++ b/src/main/java/org/codelibs/fess/es/config/cbean/bs/BsDuplicateHostCB.java @@ -75,7 +75,7 @@ public class BsDuplicateHostCB extends EsAbstractConditionBean { @Override public void acceptPrimaryKeyMap(Map primaryKeyMap) { - acceptPK((String)primaryKeyMap.get("_id")); + acceptPK((String) primaryKeyMap.get("_id")); } // =================================================================================== @@ -161,21 +161,27 @@ public class BsDuplicateHostCB extends EsAbstractConditionBean { public void columnCreatedBy() { doColumn("createdBy"); } + public void columnCreatedTime() { doColumn("createdTime"); } + public void columnDuplicateHostName() { doColumn("duplicateHostName"); } + public void columnRegularName() { doColumn("regularName"); } + public void columnSortOrder() { doColumn("sortOrder"); } + public void columnUpdatedBy() { doColumn("updatedBy"); } + public void columnUpdatedTime() { doColumn("updatedTime"); } diff --git a/src/main/java/org/codelibs/fess/es/config/cbean/bs/BsElevateWordCB.java b/src/main/java/org/codelibs/fess/es/config/cbean/bs/BsElevateWordCB.java index 17a367fbb..81dcdf6d0 100644 --- a/src/main/java/org/codelibs/fess/es/config/cbean/bs/BsElevateWordCB.java +++ b/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 primaryKeyMap) { - acceptPK((String)primaryKeyMap.get("_id")); + acceptPK((String) primaryKeyMap.get("_id")); } // =================================================================================== @@ -161,27 +161,35 @@ 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"); } diff --git a/src/main/java/org/codelibs/fess/es/config/cbean/bs/BsElevateWordToLabelCB.java b/src/main/java/org/codelibs/fess/es/config/cbean/bs/BsElevateWordToLabelCB.java index 602df8115..b288853dc 100644 --- a/src/main/java/org/codelibs/fess/es/config/cbean/bs/BsElevateWordToLabelCB.java +++ b/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 primaryKeyMap) { - acceptPK((String)primaryKeyMap.get("_id")); + acceptPK((String) primaryKeyMap.get("_id")); } // =================================================================================== @@ -161,6 +161,7 @@ public class BsElevateWordToLabelCB extends EsAbstractConditionBean { public void columnElevateWordId() { doColumn("elevateWordId"); } + public void columnLabelTypeId() { doColumn("labelTypeId"); } diff --git a/src/main/java/org/codelibs/fess/es/config/cbean/bs/BsFailureUrlCB.java b/src/main/java/org/codelibs/fess/es/config/cbean/bs/BsFailureUrlCB.java index 215265852..a6fe0acef 100644 --- a/src/main/java/org/codelibs/fess/es/config/cbean/bs/BsFailureUrlCB.java +++ b/src/main/java/org/codelibs/fess/es/config/cbean/bs/BsFailureUrlCB.java @@ -75,7 +75,7 @@ public class BsFailureUrlCB extends EsAbstractConditionBean { @Override public void acceptPrimaryKeyMap(Map primaryKeyMap) { - acceptPK((String)primaryKeyMap.get("_id")); + acceptPK((String) primaryKeyMap.get("_id")); } // =================================================================================== @@ -161,21 +161,27 @@ public class BsFailureUrlCB extends EsAbstractConditionBean { public void columnConfigId() { doColumn("configId"); } + public void columnErrorCount() { doColumn("errorCount"); } + public void columnErrorLog() { doColumn("errorLog"); } + public void columnErrorName() { doColumn("errorName"); } + public void columnLastAccessTime() { doColumn("lastAccessTime"); } + public void columnThreadName() { doColumn("threadName"); } + public void columnUrl() { doColumn("url"); } diff --git a/src/main/java/org/codelibs/fess/es/config/cbean/bs/BsFileAuthenticationCB.java b/src/main/java/org/codelibs/fess/es/config/cbean/bs/BsFileAuthenticationCB.java index 7b6e3a48e..eb9c2a6a3 100644 --- a/src/main/java/org/codelibs/fess/es/config/cbean/bs/BsFileAuthenticationCB.java +++ b/src/main/java/org/codelibs/fess/es/config/cbean/bs/BsFileAuthenticationCB.java @@ -75,7 +75,7 @@ public class BsFileAuthenticationCB extends EsAbstractConditionBean { @Override public void acceptPrimaryKeyMap(Map primaryKeyMap) { - acceptPK((String)primaryKeyMap.get("_id")); + acceptPK((String) primaryKeyMap.get("_id")); } // =================================================================================== @@ -161,33 +161,43 @@ public class BsFileAuthenticationCB extends EsAbstractConditionBean { public void columnCreatedBy() { doColumn("createdBy"); } + public void columnCreatedTime() { doColumn("createdTime"); } + public void columnFileConfigId() { doColumn("fileConfigId"); } + public void columnHostname() { doColumn("hostname"); } + public void columnParameters() { doColumn("parameters"); } + public void columnPassword() { doColumn("password"); } + public void columnPort() { doColumn("port"); } + public void columnProtocolScheme() { doColumn("protocolScheme"); } + public void columnUpdatedBy() { doColumn("updatedBy"); } + public void columnUpdatedTime() { doColumn("updatedTime"); } + public void columnUsername() { doColumn("username"); } diff --git a/src/main/java/org/codelibs/fess/es/config/cbean/bs/BsFileConfigCB.java b/src/main/java/org/codelibs/fess/es/config/cbean/bs/BsFileConfigCB.java index d4c76f7e2..4bc1c4c91 100644 --- a/src/main/java/org/codelibs/fess/es/config/cbean/bs/BsFileConfigCB.java +++ b/src/main/java/org/codelibs/fess/es/config/cbean/bs/BsFileConfigCB.java @@ -75,7 +75,7 @@ public class BsFileConfigCB extends EsAbstractConditionBean { @Override public void acceptPrimaryKeyMap(Map primaryKeyMap) { - acceptPK((String)primaryKeyMap.get("_id")); + acceptPK((String) primaryKeyMap.get("_id")); } // =================================================================================== @@ -161,60 +161,79 @@ 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"); } diff --git a/src/main/java/org/codelibs/fess/es/config/cbean/bs/BsFileConfigToLabelCB.java b/src/main/java/org/codelibs/fess/es/config/cbean/bs/BsFileConfigToLabelCB.java index fc9e7a82e..1dc736555 100644 --- a/src/main/java/org/codelibs/fess/es/config/cbean/bs/BsFileConfigToLabelCB.java +++ b/src/main/java/org/codelibs/fess/es/config/cbean/bs/BsFileConfigToLabelCB.java @@ -75,7 +75,7 @@ public class BsFileConfigToLabelCB extends EsAbstractConditionBean { @Override public void acceptPrimaryKeyMap(Map primaryKeyMap) { - acceptPK((String)primaryKeyMap.get("_id")); + acceptPK((String) primaryKeyMap.get("_id")); } // =================================================================================== @@ -161,6 +161,7 @@ public class BsFileConfigToLabelCB extends EsAbstractConditionBean { public void columnFileConfigId() { doColumn("fileConfigId"); } + public void columnLabelTypeId() { doColumn("labelTypeId"); } diff --git a/src/main/java/org/codelibs/fess/es/config/cbean/bs/BsFileConfigToRoleCB.java b/src/main/java/org/codelibs/fess/es/config/cbean/bs/BsFileConfigToRoleCB.java index b96978cb0..d77e09145 100644 --- a/src/main/java/org/codelibs/fess/es/config/cbean/bs/BsFileConfigToRoleCB.java +++ b/src/main/java/org/codelibs/fess/es/config/cbean/bs/BsFileConfigToRoleCB.java @@ -75,7 +75,7 @@ public class BsFileConfigToRoleCB extends EsAbstractConditionBean { @Override public void acceptPrimaryKeyMap(Map primaryKeyMap) { - acceptPK((String)primaryKeyMap.get("_id")); + acceptPK((String) primaryKeyMap.get("_id")); } // =================================================================================== @@ -161,6 +161,7 @@ public class BsFileConfigToRoleCB extends EsAbstractConditionBean { public void columnFileConfigId() { doColumn("fileConfigId"); } + public void columnRoleTypeId() { doColumn("roleTypeId"); } diff --git a/src/main/java/org/codelibs/fess/es/config/cbean/bs/BsJobLogCB.java b/src/main/java/org/codelibs/fess/es/config/cbean/bs/BsJobLogCB.java index e43f7128d..14d589a53 100644 --- a/src/main/java/org/codelibs/fess/es/config/cbean/bs/BsJobLogCB.java +++ b/src/main/java/org/codelibs/fess/es/config/cbean/bs/BsJobLogCB.java @@ -75,7 +75,7 @@ public class BsJobLogCB extends EsAbstractConditionBean { @Override public void acceptPrimaryKeyMap(Map primaryKeyMap) { - acceptPK((String)primaryKeyMap.get("_id")); + acceptPK((String) primaryKeyMap.get("_id")); } // =================================================================================== @@ -161,24 +161,31 @@ public class BsJobLogCB extends EsAbstractConditionBean { public void columnEndTime() { doColumn("endTime"); } + public void columnJobName() { doColumn("jobName"); } + public void columnJobStatus() { doColumn("jobStatus"); } + public void columnScriptData() { doColumn("scriptData"); } + public void columnScriptResult() { doColumn("scriptResult"); } + public void columnScriptType() { doColumn("scriptType"); } + public void columnStartTime() { doColumn("startTime"); } + public void columnTarget() { doColumn("target"); } diff --git a/src/main/java/org/codelibs/fess/es/config/cbean/bs/BsKeyMatchCB.java b/src/main/java/org/codelibs/fess/es/config/cbean/bs/BsKeyMatchCB.java index 041285537..885833453 100644 --- a/src/main/java/org/codelibs/fess/es/config/cbean/bs/BsKeyMatchCB.java +++ b/src/main/java/org/codelibs/fess/es/config/cbean/bs/BsKeyMatchCB.java @@ -75,7 +75,7 @@ public class BsKeyMatchCB extends EsAbstractConditionBean { @Override public void acceptPrimaryKeyMap(Map primaryKeyMap) { - acceptPK((String)primaryKeyMap.get("_id")); + acceptPK((String) primaryKeyMap.get("_id")); } // =================================================================================== @@ -161,24 +161,31 @@ public class BsKeyMatchCB extends EsAbstractConditionBean { public void columnBoost() { doColumn("boost"); } + public void columnCreatedBy() { doColumn("createdBy"); } + public void columnCreatedTime() { doColumn("createdTime"); } + public void columnMaxSize() { doColumn("maxSize"); } + public void columnQuery() { doColumn("query"); } + public void columnTerm() { doColumn("term"); } + public void columnUpdatedBy() { doColumn("updatedBy"); } + public void columnUpdatedTime() { doColumn("updatedTime"); } diff --git a/src/main/java/org/codelibs/fess/es/config/cbean/bs/BsLabelToRoleCB.java b/src/main/java/org/codelibs/fess/es/config/cbean/bs/BsLabelToRoleCB.java index 4cc16550f..0b630be7e 100644 --- a/src/main/java/org/codelibs/fess/es/config/cbean/bs/BsLabelToRoleCB.java +++ b/src/main/java/org/codelibs/fess/es/config/cbean/bs/BsLabelToRoleCB.java @@ -75,7 +75,7 @@ public class BsLabelToRoleCB extends EsAbstractConditionBean { @Override public void acceptPrimaryKeyMap(Map primaryKeyMap) { - acceptPK((String)primaryKeyMap.get("_id")); + acceptPK((String) primaryKeyMap.get("_id")); } // =================================================================================== @@ -161,6 +161,7 @@ public class BsLabelToRoleCB extends EsAbstractConditionBean { public void columnLabelTypeId() { doColumn("labelTypeId"); } + public void columnRoleTypeId() { doColumn("roleTypeId"); } diff --git a/src/main/java/org/codelibs/fess/es/config/cbean/bs/BsLabelTypeCB.java b/src/main/java/org/codelibs/fess/es/config/cbean/bs/BsLabelTypeCB.java index 66df61674..c3e750822 100644 --- a/src/main/java/org/codelibs/fess/es/config/cbean/bs/BsLabelTypeCB.java +++ b/src/main/java/org/codelibs/fess/es/config/cbean/bs/BsLabelTypeCB.java @@ -75,7 +75,7 @@ public class BsLabelTypeCB extends EsAbstractConditionBean { @Override public void acceptPrimaryKeyMap(Map primaryKeyMap) { - acceptPK((String)primaryKeyMap.get("_id")); + acceptPK((String) primaryKeyMap.get("_id")); } // =================================================================================== @@ -161,30 +161,39 @@ public class BsLabelTypeCB extends EsAbstractConditionBean { public void columnCreatedBy() { doColumn("createdBy"); } + public void columnCreatedTime() { doColumn("createdTime"); } + public void columnExcludedPaths() { doColumn("excludedPaths"); } + public void columnIncludedPaths() { doColumn("includedPaths"); } + public void columnName() { doColumn("name"); } + public void columnPermissions() { doColumn("permissions"); } + public void columnSortOrder() { doColumn("sortOrder"); } + public void columnUpdatedBy() { doColumn("updatedBy"); } + public void columnUpdatedTime() { doColumn("updatedTime"); } + public void columnValue() { doColumn("value"); } diff --git a/src/main/java/org/codelibs/fess/es/config/cbean/bs/BsPathMappingCB.java b/src/main/java/org/codelibs/fess/es/config/cbean/bs/BsPathMappingCB.java index 4235a9923..424d1ca14 100644 --- a/src/main/java/org/codelibs/fess/es/config/cbean/bs/BsPathMappingCB.java +++ b/src/main/java/org/codelibs/fess/es/config/cbean/bs/BsPathMappingCB.java @@ -75,7 +75,7 @@ public class BsPathMappingCB extends EsAbstractConditionBean { @Override public void acceptPrimaryKeyMap(Map primaryKeyMap) { - acceptPK((String)primaryKeyMap.get("_id")); + acceptPK((String) primaryKeyMap.get("_id")); } // =================================================================================== @@ -161,24 +161,31 @@ public class BsPathMappingCB extends EsAbstractConditionBean { public void columnCreatedBy() { doColumn("createdBy"); } + public void columnCreatedTime() { doColumn("createdTime"); } + public void columnProcessType() { doColumn("processType"); } + public void columnRegex() { doColumn("regex"); } + public void columnReplacement() { doColumn("replacement"); } + public void columnSortOrder() { doColumn("sortOrder"); } + public void columnUpdatedBy() { doColumn("updatedBy"); } + public void columnUpdatedTime() { doColumn("updatedTime"); } diff --git a/src/main/java/org/codelibs/fess/es/config/cbean/bs/BsRequestHeaderCB.java b/src/main/java/org/codelibs/fess/es/config/cbean/bs/BsRequestHeaderCB.java index d4a9e43a6..9c9e28f22 100644 --- a/src/main/java/org/codelibs/fess/es/config/cbean/bs/BsRequestHeaderCB.java +++ b/src/main/java/org/codelibs/fess/es/config/cbean/bs/BsRequestHeaderCB.java @@ -75,7 +75,7 @@ public class BsRequestHeaderCB extends EsAbstractConditionBean { @Override public void acceptPrimaryKeyMap(Map primaryKeyMap) { - acceptPK((String)primaryKeyMap.get("_id")); + acceptPK((String) primaryKeyMap.get("_id")); } // =================================================================================== @@ -161,21 +161,27 @@ public class BsRequestHeaderCB extends EsAbstractConditionBean { public void columnCreatedBy() { doColumn("createdBy"); } + public void columnCreatedTime() { doColumn("createdTime"); } + public void columnName() { doColumn("name"); } + public void columnUpdatedBy() { doColumn("updatedBy"); } + public void columnUpdatedTime() { doColumn("updatedTime"); } + public void columnValue() { doColumn("value"); } + public void columnWebConfigId() { doColumn("webConfigId"); } diff --git a/src/main/java/org/codelibs/fess/es/config/cbean/bs/BsRoleTypeCB.java b/src/main/java/org/codelibs/fess/es/config/cbean/bs/BsRoleTypeCB.java index 89b7d7dad..4c5733e2c 100644 --- a/src/main/java/org/codelibs/fess/es/config/cbean/bs/BsRoleTypeCB.java +++ b/src/main/java/org/codelibs/fess/es/config/cbean/bs/BsRoleTypeCB.java @@ -75,7 +75,7 @@ public class BsRoleTypeCB extends EsAbstractConditionBean { @Override public void acceptPrimaryKeyMap(Map primaryKeyMap) { - acceptPK((String)primaryKeyMap.get("_id")); + acceptPK((String) primaryKeyMap.get("_id")); } // =================================================================================== @@ -161,21 +161,27 @@ public class BsRoleTypeCB extends EsAbstractConditionBean { public void columnCreatedBy() { doColumn("createdBy"); } + public void columnCreatedTime() { doColumn("createdTime"); } + public void columnName() { doColumn("name"); } + public void columnSortOrder() { doColumn("sortOrder"); } + public void columnUpdatedBy() { doColumn("updatedBy"); } + public void columnUpdatedTime() { doColumn("updatedTime"); } + public void columnValue() { doColumn("value"); } diff --git a/src/main/java/org/codelibs/fess/es/config/cbean/bs/BsScheduledJobCB.java b/src/main/java/org/codelibs/fess/es/config/cbean/bs/BsScheduledJobCB.java index 806a65fae..1376e4c01 100644 --- a/src/main/java/org/codelibs/fess/es/config/cbean/bs/BsScheduledJobCB.java +++ b/src/main/java/org/codelibs/fess/es/config/cbean/bs/BsScheduledJobCB.java @@ -75,7 +75,7 @@ public class BsScheduledJobCB extends EsAbstractConditionBean { @Override public void acceptPrimaryKeyMap(Map primaryKeyMap) { - acceptPK((String)primaryKeyMap.get("_id")); + acceptPK((String) primaryKeyMap.get("_id")); } // =================================================================================== @@ -161,39 +161,51 @@ public class BsScheduledJobCB extends EsAbstractConditionBean { public void columnAvailable() { doColumn("available"); } + public void columnCrawler() { doColumn("crawler"); } + public void columnCreatedBy() { doColumn("createdBy"); } + public void columnCreatedTime() { doColumn("createdTime"); } + public void columnCronExpression() { doColumn("cronExpression"); } + public void columnJobLogging() { doColumn("jobLogging"); } + public void columnName() { doColumn("name"); } + public void columnScriptData() { doColumn("scriptData"); } + public void columnScriptType() { doColumn("scriptType"); } + public void columnSortOrder() { doColumn("sortOrder"); } + public void columnTarget() { doColumn("target"); } + public void columnUpdatedBy() { doColumn("updatedBy"); } + public void columnUpdatedTime() { doColumn("updatedTime"); } diff --git a/src/main/java/org/codelibs/fess/es/config/cbean/bs/BsWebAuthenticationCB.java b/src/main/java/org/codelibs/fess/es/config/cbean/bs/BsWebAuthenticationCB.java index 048e0024d..57ba2ae29 100644 --- a/src/main/java/org/codelibs/fess/es/config/cbean/bs/BsWebAuthenticationCB.java +++ b/src/main/java/org/codelibs/fess/es/config/cbean/bs/BsWebAuthenticationCB.java @@ -75,7 +75,7 @@ public class BsWebAuthenticationCB extends EsAbstractConditionBean { @Override public void acceptPrimaryKeyMap(Map primaryKeyMap) { - acceptPK((String)primaryKeyMap.get("_id")); + acceptPK((String) primaryKeyMap.get("_id")); } // =================================================================================== @@ -161,36 +161,47 @@ public class BsWebAuthenticationCB extends EsAbstractConditionBean { public void columnAuthRealm() { doColumn("authRealm"); } + public void columnCreatedBy() { doColumn("createdBy"); } + public void columnCreatedTime() { doColumn("createdTime"); } + public void columnHostname() { doColumn("hostname"); } + public void columnParameters() { doColumn("parameters"); } + public void columnPassword() { doColumn("password"); } + public void columnPort() { doColumn("port"); } + public void columnProtocolScheme() { doColumn("protocolScheme"); } + public void columnUpdatedBy() { doColumn("updatedBy"); } + public void columnUpdatedTime() { doColumn("updatedTime"); } + public void columnUsername() { doColumn("username"); } + public void columnWebConfigId() { doColumn("webConfigId"); } diff --git a/src/main/java/org/codelibs/fess/es/config/cbean/bs/BsWebConfigCB.java b/src/main/java/org/codelibs/fess/es/config/cbean/bs/BsWebConfigCB.java index e3b7835fd..371feb16f 100644 --- a/src/main/java/org/codelibs/fess/es/config/cbean/bs/BsWebConfigCB.java +++ b/src/main/java/org/codelibs/fess/es/config/cbean/bs/BsWebConfigCB.java @@ -75,7 +75,7 @@ public class BsWebConfigCB extends EsAbstractConditionBean { @Override public void acceptPrimaryKeyMap(Map primaryKeyMap) { - acceptPK((String)primaryKeyMap.get("_id")); + acceptPK((String) primaryKeyMap.get("_id")); } // =================================================================================== @@ -161,63 +161,83 @@ public class BsWebConfigCB extends EsAbstractConditionBean { public void columnAvailable() { doColumn("available"); } + public void columnBoost() { doColumn("boost"); } + public void columnConfigParameter() { doColumn("configParameter"); } + public void columnCreatedBy() { doColumn("createdBy"); } + public void columnCreatedTime() { doColumn("createdTime"); } + public void columnDepth() { doColumn("depth"); } + public void columnExcludedDocUrls() { doColumn("excludedDocUrls"); } + public void columnExcludedUrls() { doColumn("excludedUrls"); } + public void columnIncludedDocUrls() { doColumn("includedDocUrls"); } + public void columnIncludedUrls() { doColumn("includedUrls"); } + public void columnIntervalTime() { doColumn("intervalTime"); } + public void columnTimeToLive() { doColumn("timeToLive"); } + public void columnMaxAccessCount() { doColumn("maxAccessCount"); } + public void columnName() { doColumn("name"); } + public void columnNumOfThread() { doColumn("numOfThread"); } + public void columnPermissions() { doColumn("permissions"); } + public void columnSortOrder() { doColumn("sortOrder"); } + public void columnUpdatedBy() { doColumn("updatedBy"); } + public void columnUpdatedTime() { doColumn("updatedTime"); } + public void columnUrls() { doColumn("urls"); } + public void columnUserAgent() { doColumn("userAgent"); } diff --git a/src/main/java/org/codelibs/fess/es/config/cbean/bs/BsWebConfigToLabelCB.java b/src/main/java/org/codelibs/fess/es/config/cbean/bs/BsWebConfigToLabelCB.java index 2cecfc1a6..fd6226e3f 100644 --- a/src/main/java/org/codelibs/fess/es/config/cbean/bs/BsWebConfigToLabelCB.java +++ b/src/main/java/org/codelibs/fess/es/config/cbean/bs/BsWebConfigToLabelCB.java @@ -75,7 +75,7 @@ public class BsWebConfigToLabelCB extends EsAbstractConditionBean { @Override public void acceptPrimaryKeyMap(Map primaryKeyMap) { - acceptPK((String)primaryKeyMap.get("_id")); + acceptPK((String) primaryKeyMap.get("_id")); } // =================================================================================== @@ -161,6 +161,7 @@ public class BsWebConfigToLabelCB extends EsAbstractConditionBean { public void columnLabelTypeId() { doColumn("labelTypeId"); } + public void columnWebConfigId() { doColumn("webConfigId"); } diff --git a/src/main/java/org/codelibs/fess/es/config/cbean/bs/BsWebConfigToRoleCB.java b/src/main/java/org/codelibs/fess/es/config/cbean/bs/BsWebConfigToRoleCB.java index 3febda475..90628cea1 100644 --- a/src/main/java/org/codelibs/fess/es/config/cbean/bs/BsWebConfigToRoleCB.java +++ b/src/main/java/org/codelibs/fess/es/config/cbean/bs/BsWebConfigToRoleCB.java @@ -75,7 +75,7 @@ public class BsWebConfigToRoleCB extends EsAbstractConditionBean { @Override public void acceptPrimaryKeyMap(Map primaryKeyMap) { - acceptPK((String)primaryKeyMap.get("_id")); + acceptPK((String) primaryKeyMap.get("_id")); } // =================================================================================== @@ -161,6 +161,7 @@ public class BsWebConfigToRoleCB extends EsAbstractConditionBean { public void columnRoleTypeId() { doColumn("roleTypeId"); } + public void columnWebConfigId() { doColumn("webConfigId"); } diff --git a/src/main/java/org/codelibs/fess/es/config/cbean/cq/bs/BsBadWordCQ.java b/src/main/java/org/codelibs/fess/es/config/cbean/cq/bs/BsBadWordCQ.java index ac1dc257a..ae4900ca3 100644 --- a/src/main/java/org/codelibs/fess/es/config/cbean/cq/bs/BsBadWordCQ.java +++ b/src/main/java/org/codelibs/fess/es/config/cbean/cq/bs/BsBadWordCQ.java @@ -15,7 +15,7 @@ */ package org.codelibs.fess.es.config.cbean.cq.bs; -import java.time.*; +import java.time.LocalDateTime; import java.util.Collection; import org.codelibs.fess.es.config.allcommon.EsAbstractConditionQuery; @@ -33,7 +33,6 @@ import org.elasticsearch.index.query.RangeQueryBuilder; import org.elasticsearch.index.query.TermQueryBuilder; import org.elasticsearch.index.query.TermsQueryBuilder; - /** * @author ESFlute (using FreeGen) */ @@ -61,9 +60,8 @@ public abstract class BsBadWordCQ extends EsAbstractConditionQuery { filtered(filteredLambda, null); } - public void filtered(FilteredCall filteredLambda, - ConditionOptionCall opLambda) { - bool((must, should, mustNot, filter)->{ + public void filtered(FilteredCall filteredLambda, ConditionOptionCall opLambda) { + bool((must, should, mustNot, filter) -> { filteredLambda.callback(must, filter); }, opLambda); } @@ -98,7 +96,9 @@ public abstract class BsBadWordCQ extends EsAbstractConditionQuery { BadWordCQ filterQuery = new BadWordCQ(); boolLambda.callback(mustQuery, shouldQuery, mustNotQuery, filterQuery); if (mustQuery.hasQueries() || shouldQuery.hasQueries() || mustNotQuery.hasQueries() || filterQuery.hasQueries()) { - BoolQueryBuilder builder = regBoolCQ(mustQuery.getQueryBuilderList(), shouldQuery.getQueryBuilderList(), mustNotQuery.getQueryBuilderList(), filterQuery.getQueryBuilderList()); + BoolQueryBuilder builder = + regBoolCQ(mustQuery.getQueryBuilderList(), shouldQuery.getQueryBuilderList(), mustNotQuery.getQueryBuilderList(), + filterQuery.getQueryBuilderList()); if (opLambda != null) { opLambda.callback(builder); } diff --git a/src/main/java/org/codelibs/fess/es/config/cbean/cq/bs/BsBoostDocumentRuleCQ.java b/src/main/java/org/codelibs/fess/es/config/cbean/cq/bs/BsBoostDocumentRuleCQ.java index 35bb7d380..27e349d5d 100644 --- a/src/main/java/org/codelibs/fess/es/config/cbean/cq/bs/BsBoostDocumentRuleCQ.java +++ b/src/main/java/org/codelibs/fess/es/config/cbean/cq/bs/BsBoostDocumentRuleCQ.java @@ -15,7 +15,7 @@ */ package org.codelibs.fess.es.config.cbean.cq.bs; -import java.time.*; +import java.time.LocalDateTime; import java.util.Collection; import org.codelibs.fess.es.config.allcommon.EsAbstractConditionQuery; @@ -33,7 +33,6 @@ import org.elasticsearch.index.query.RangeQueryBuilder; import org.elasticsearch.index.query.TermQueryBuilder; import org.elasticsearch.index.query.TermsQueryBuilder; - /** * @author ESFlute (using FreeGen) */ @@ -63,7 +62,7 @@ public abstract class BsBoostDocumentRuleCQ extends EsAbstractConditionQuery { public void filtered(FilteredCall filteredLambda, ConditionOptionCall opLambda) { - bool((must, should, mustNot, filter)->{ + bool((must, should, mustNot, filter) -> { filteredLambda.callback(must, filter); }, opLambda); } @@ -98,7 +97,9 @@ public abstract class BsBoostDocumentRuleCQ extends EsAbstractConditionQuery { BoostDocumentRuleCQ filterQuery = new BoostDocumentRuleCQ(); boolLambda.callback(mustQuery, shouldQuery, mustNotQuery, filterQuery); if (mustQuery.hasQueries() || shouldQuery.hasQueries() || mustNotQuery.hasQueries() || filterQuery.hasQueries()) { - BoolQueryBuilder builder = regBoolCQ(mustQuery.getQueryBuilderList(), shouldQuery.getQueryBuilderList(), mustNotQuery.getQueryBuilderList(), filterQuery.getQueryBuilderList()); + BoolQueryBuilder builder = + regBoolCQ(mustQuery.getQueryBuilderList(), shouldQuery.getQueryBuilderList(), mustNotQuery.getQueryBuilderList(), + filterQuery.getQueryBuilderList()); if (opLambda != null) { opLambda.callback(builder); } diff --git a/src/main/java/org/codelibs/fess/es/config/cbean/cq/bs/BsCrawlingInfoCQ.java b/src/main/java/org/codelibs/fess/es/config/cbean/cq/bs/BsCrawlingInfoCQ.java index 184d65086..4e65d3657 100644 --- a/src/main/java/org/codelibs/fess/es/config/cbean/cq/bs/BsCrawlingInfoCQ.java +++ b/src/main/java/org/codelibs/fess/es/config/cbean/cq/bs/BsCrawlingInfoCQ.java @@ -15,7 +15,7 @@ */ package org.codelibs.fess.es.config.cbean.cq.bs; -import java.time.*; +import java.time.LocalDateTime; import java.util.Collection; import org.codelibs.fess.es.config.allcommon.EsAbstractConditionQuery; @@ -33,7 +33,6 @@ import org.elasticsearch.index.query.RangeQueryBuilder; import org.elasticsearch.index.query.TermQueryBuilder; import org.elasticsearch.index.query.TermsQueryBuilder; - /** * @author ESFlute (using FreeGen) */ @@ -61,9 +60,8 @@ public abstract class BsCrawlingInfoCQ extends EsAbstractConditionQuery { filtered(filteredLambda, null); } - public void filtered(FilteredCall filteredLambda, - ConditionOptionCall opLambda) { - bool((must, should, mustNot, filter)->{ + public void filtered(FilteredCall filteredLambda, ConditionOptionCall opLambda) { + bool((must, should, mustNot, filter) -> { filteredLambda.callback(must, filter); }, opLambda); } @@ -98,7 +96,9 @@ public abstract class BsCrawlingInfoCQ extends EsAbstractConditionQuery { CrawlingInfoCQ filterQuery = new CrawlingInfoCQ(); boolLambda.callback(mustQuery, shouldQuery, mustNotQuery, filterQuery); if (mustQuery.hasQueries() || shouldQuery.hasQueries() || mustNotQuery.hasQueries() || filterQuery.hasQueries()) { - BoolQueryBuilder builder = regBoolCQ(mustQuery.getQueryBuilderList(), shouldQuery.getQueryBuilderList(), mustNotQuery.getQueryBuilderList(), filterQuery.getQueryBuilderList()); + BoolQueryBuilder builder = + regBoolCQ(mustQuery.getQueryBuilderList(), shouldQuery.getQueryBuilderList(), mustNotQuery.getQueryBuilderList(), + filterQuery.getQueryBuilderList()); if (opLambda != null) { opLambda.callback(builder); } diff --git a/src/main/java/org/codelibs/fess/es/config/cbean/cq/bs/BsCrawlingInfoParamCQ.java b/src/main/java/org/codelibs/fess/es/config/cbean/cq/bs/BsCrawlingInfoParamCQ.java index 6ea627592..d0668556e 100644 --- a/src/main/java/org/codelibs/fess/es/config/cbean/cq/bs/BsCrawlingInfoParamCQ.java +++ b/src/main/java/org/codelibs/fess/es/config/cbean/cq/bs/BsCrawlingInfoParamCQ.java @@ -15,7 +15,7 @@ */ package org.codelibs.fess.es.config.cbean.cq.bs; -import java.time.*; +import java.time.LocalDateTime; import java.util.Collection; import org.codelibs.fess.es.config.allcommon.EsAbstractConditionQuery; @@ -33,7 +33,6 @@ import org.elasticsearch.index.query.RangeQueryBuilder; import org.elasticsearch.index.query.TermQueryBuilder; import org.elasticsearch.index.query.TermsQueryBuilder; - /** * @author ESFlute (using FreeGen) */ @@ -63,7 +62,7 @@ public abstract class BsCrawlingInfoParamCQ extends EsAbstractConditionQuery { public void filtered(FilteredCall filteredLambda, ConditionOptionCall opLambda) { - bool((must, should, mustNot, filter)->{ + bool((must, should, mustNot, filter) -> { filteredLambda.callback(must, filter); }, opLambda); } @@ -98,7 +97,9 @@ public abstract class BsCrawlingInfoParamCQ extends EsAbstractConditionQuery { CrawlingInfoParamCQ filterQuery = new CrawlingInfoParamCQ(); boolLambda.callback(mustQuery, shouldQuery, mustNotQuery, filterQuery); if (mustQuery.hasQueries() || shouldQuery.hasQueries() || mustNotQuery.hasQueries() || filterQuery.hasQueries()) { - BoolQueryBuilder builder = regBoolCQ(mustQuery.getQueryBuilderList(), shouldQuery.getQueryBuilderList(), mustNotQuery.getQueryBuilderList(), filterQuery.getQueryBuilderList()); + BoolQueryBuilder builder = + regBoolCQ(mustQuery.getQueryBuilderList(), shouldQuery.getQueryBuilderList(), mustNotQuery.getQueryBuilderList(), + filterQuery.getQueryBuilderList()); if (opLambda != null) { opLambda.callback(builder); } diff --git a/src/main/java/org/codelibs/fess/es/config/cbean/cq/bs/BsDataConfigCQ.java b/src/main/java/org/codelibs/fess/es/config/cbean/cq/bs/BsDataConfigCQ.java index 96e52f3f4..a5c6ef8af 100644 --- a/src/main/java/org/codelibs/fess/es/config/cbean/cq/bs/BsDataConfigCQ.java +++ b/src/main/java/org/codelibs/fess/es/config/cbean/cq/bs/BsDataConfigCQ.java @@ -15,7 +15,7 @@ */ package org.codelibs.fess.es.config.cbean.cq.bs; -import java.time.*; +import java.time.LocalDateTime; import java.util.Collection; import org.codelibs.fess.es.config.allcommon.EsAbstractConditionQuery; @@ -33,7 +33,6 @@ import org.elasticsearch.index.query.RangeQueryBuilder; import org.elasticsearch.index.query.TermQueryBuilder; import org.elasticsearch.index.query.TermsQueryBuilder; - /** * @author ESFlute (using FreeGen) */ @@ -61,9 +60,8 @@ public abstract class BsDataConfigCQ extends EsAbstractConditionQuery { filtered(filteredLambda, null); } - public void filtered(FilteredCall filteredLambda, - ConditionOptionCall opLambda) { - bool((must, should, mustNot, filter)->{ + public void filtered(FilteredCall filteredLambda, ConditionOptionCall opLambda) { + bool((must, should, mustNot, filter) -> { filteredLambda.callback(must, filter); }, opLambda); } @@ -98,7 +96,9 @@ public abstract class BsDataConfigCQ extends EsAbstractConditionQuery { DataConfigCQ filterQuery = new DataConfigCQ(); boolLambda.callback(mustQuery, shouldQuery, mustNotQuery, filterQuery); if (mustQuery.hasQueries() || shouldQuery.hasQueries() || mustNotQuery.hasQueries() || filterQuery.hasQueries()) { - BoolQueryBuilder builder = regBoolCQ(mustQuery.getQueryBuilderList(), shouldQuery.getQueryBuilderList(), mustNotQuery.getQueryBuilderList(), filterQuery.getQueryBuilderList()); + BoolQueryBuilder builder = + regBoolCQ(mustQuery.getQueryBuilderList(), shouldQuery.getQueryBuilderList(), mustNotQuery.getQueryBuilderList(), + filterQuery.getQueryBuilderList()); if (opLambda != null) { opLambda.callback(builder); } diff --git a/src/main/java/org/codelibs/fess/es/config/cbean/cq/bs/BsDataConfigToLabelCQ.java b/src/main/java/org/codelibs/fess/es/config/cbean/cq/bs/BsDataConfigToLabelCQ.java index 677f6c0ca..2a0a3848c 100644 --- a/src/main/java/org/codelibs/fess/es/config/cbean/cq/bs/BsDataConfigToLabelCQ.java +++ b/src/main/java/org/codelibs/fess/es/config/cbean/cq/bs/BsDataConfigToLabelCQ.java @@ -15,7 +15,7 @@ */ package org.codelibs.fess.es.config.cbean.cq.bs; -import java.time.*; +import java.time.LocalDateTime; import java.util.Collection; import org.codelibs.fess.es.config.allcommon.EsAbstractConditionQuery; @@ -33,7 +33,6 @@ import org.elasticsearch.index.query.RangeQueryBuilder; import org.elasticsearch.index.query.TermQueryBuilder; import org.elasticsearch.index.query.TermsQueryBuilder; - /** * @author ESFlute (using FreeGen) */ @@ -63,7 +62,7 @@ public abstract class BsDataConfigToLabelCQ extends EsAbstractConditionQuery { public void filtered(FilteredCall filteredLambda, ConditionOptionCall opLambda) { - bool((must, should, mustNot, filter)->{ + bool((must, should, mustNot, filter) -> { filteredLambda.callback(must, filter); }, opLambda); } @@ -98,7 +97,9 @@ public abstract class BsDataConfigToLabelCQ extends EsAbstractConditionQuery { DataConfigToLabelCQ filterQuery = new DataConfigToLabelCQ(); boolLambda.callback(mustQuery, shouldQuery, mustNotQuery, filterQuery); if (mustQuery.hasQueries() || shouldQuery.hasQueries() || mustNotQuery.hasQueries() || filterQuery.hasQueries()) { - BoolQueryBuilder builder = regBoolCQ(mustQuery.getQueryBuilderList(), shouldQuery.getQueryBuilderList(), mustNotQuery.getQueryBuilderList(), filterQuery.getQueryBuilderList()); + BoolQueryBuilder builder = + regBoolCQ(mustQuery.getQueryBuilderList(), shouldQuery.getQueryBuilderList(), mustNotQuery.getQueryBuilderList(), + filterQuery.getQueryBuilderList()); if (opLambda != null) { opLambda.callback(builder); } diff --git a/src/main/java/org/codelibs/fess/es/config/cbean/cq/bs/BsDataConfigToRoleCQ.java b/src/main/java/org/codelibs/fess/es/config/cbean/cq/bs/BsDataConfigToRoleCQ.java index 53eb9626f..d88e6b878 100644 --- a/src/main/java/org/codelibs/fess/es/config/cbean/cq/bs/BsDataConfigToRoleCQ.java +++ b/src/main/java/org/codelibs/fess/es/config/cbean/cq/bs/BsDataConfigToRoleCQ.java @@ -15,7 +15,7 @@ */ package org.codelibs.fess.es.config.cbean.cq.bs; -import java.time.*; +import java.time.LocalDateTime; import java.util.Collection; import org.codelibs.fess.es.config.allcommon.EsAbstractConditionQuery; @@ -33,7 +33,6 @@ import org.elasticsearch.index.query.RangeQueryBuilder; import org.elasticsearch.index.query.TermQueryBuilder; import org.elasticsearch.index.query.TermsQueryBuilder; - /** * @author ESFlute (using FreeGen) */ @@ -61,9 +60,8 @@ public abstract class BsDataConfigToRoleCQ extends EsAbstractConditionQuery { filtered(filteredLambda, null); } - public void filtered(FilteredCall filteredLambda, - ConditionOptionCall opLambda) { - bool((must, should, mustNot, filter)->{ + public void filtered(FilteredCall filteredLambda, ConditionOptionCall opLambda) { + bool((must, should, mustNot, filter) -> { filteredLambda.callback(must, filter); }, opLambda); } @@ -98,7 +96,9 @@ public abstract class BsDataConfigToRoleCQ extends EsAbstractConditionQuery { DataConfigToRoleCQ filterQuery = new DataConfigToRoleCQ(); boolLambda.callback(mustQuery, shouldQuery, mustNotQuery, filterQuery); if (mustQuery.hasQueries() || shouldQuery.hasQueries() || mustNotQuery.hasQueries() || filterQuery.hasQueries()) { - BoolQueryBuilder builder = regBoolCQ(mustQuery.getQueryBuilderList(), shouldQuery.getQueryBuilderList(), mustNotQuery.getQueryBuilderList(), filterQuery.getQueryBuilderList()); + BoolQueryBuilder builder = + regBoolCQ(mustQuery.getQueryBuilderList(), shouldQuery.getQueryBuilderList(), mustNotQuery.getQueryBuilderList(), + filterQuery.getQueryBuilderList()); if (opLambda != null) { opLambda.callback(builder); } diff --git a/src/main/java/org/codelibs/fess/es/config/cbean/cq/bs/BsDuplicateHostCQ.java b/src/main/java/org/codelibs/fess/es/config/cbean/cq/bs/BsDuplicateHostCQ.java index e90088fd5..c737059bd 100644 --- a/src/main/java/org/codelibs/fess/es/config/cbean/cq/bs/BsDuplicateHostCQ.java +++ b/src/main/java/org/codelibs/fess/es/config/cbean/cq/bs/BsDuplicateHostCQ.java @@ -15,7 +15,7 @@ */ package org.codelibs.fess.es.config.cbean.cq.bs; -import java.time.*; +import java.time.LocalDateTime; import java.util.Collection; import org.codelibs.fess.es.config.allcommon.EsAbstractConditionQuery; @@ -33,7 +33,6 @@ import org.elasticsearch.index.query.RangeQueryBuilder; import org.elasticsearch.index.query.TermQueryBuilder; import org.elasticsearch.index.query.TermsQueryBuilder; - /** * @author ESFlute (using FreeGen) */ @@ -61,9 +60,8 @@ public abstract class BsDuplicateHostCQ extends EsAbstractConditionQuery { filtered(filteredLambda, null); } - public void filtered(FilteredCall filteredLambda, - ConditionOptionCall opLambda) { - bool((must, should, mustNot, filter)->{ + public void filtered(FilteredCall filteredLambda, ConditionOptionCall opLambda) { + bool((must, should, mustNot, filter) -> { filteredLambda.callback(must, filter); }, opLambda); } @@ -98,7 +96,9 @@ public abstract class BsDuplicateHostCQ extends EsAbstractConditionQuery { DuplicateHostCQ filterQuery = new DuplicateHostCQ(); boolLambda.callback(mustQuery, shouldQuery, mustNotQuery, filterQuery); if (mustQuery.hasQueries() || shouldQuery.hasQueries() || mustNotQuery.hasQueries() || filterQuery.hasQueries()) { - BoolQueryBuilder builder = regBoolCQ(mustQuery.getQueryBuilderList(), shouldQuery.getQueryBuilderList(), mustNotQuery.getQueryBuilderList(), filterQuery.getQueryBuilderList()); + BoolQueryBuilder builder = + regBoolCQ(mustQuery.getQueryBuilderList(), shouldQuery.getQueryBuilderList(), mustNotQuery.getQueryBuilderList(), + filterQuery.getQueryBuilderList()); if (opLambda != null) { opLambda.callback(builder); } diff --git a/src/main/java/org/codelibs/fess/es/config/cbean/cq/bs/BsElevateWordCQ.java b/src/main/java/org/codelibs/fess/es/config/cbean/cq/bs/BsElevateWordCQ.java index abbd635c4..60e7a2ea8 100644 --- a/src/main/java/org/codelibs/fess/es/config/cbean/cq/bs/BsElevateWordCQ.java +++ b/src/main/java/org/codelibs/fess/es/config/cbean/cq/bs/BsElevateWordCQ.java @@ -15,7 +15,7 @@ */ package org.codelibs.fess.es.config.cbean.cq.bs; -import java.time.*; +import java.time.LocalDateTime; import java.util.Collection; import org.codelibs.fess.es.config.allcommon.EsAbstractConditionQuery; @@ -33,7 +33,6 @@ import org.elasticsearch.index.query.RangeQueryBuilder; import org.elasticsearch.index.query.TermQueryBuilder; import org.elasticsearch.index.query.TermsQueryBuilder; - /** * @author ESFlute (using FreeGen) */ @@ -61,9 +60,8 @@ public abstract class BsElevateWordCQ extends EsAbstractConditionQuery { filtered(filteredLambda, null); } - public void filtered(FilteredCall filteredLambda, - ConditionOptionCall opLambda) { - bool((must, should, mustNot, filter)->{ + public void filtered(FilteredCall filteredLambda, ConditionOptionCall opLambda) { + bool((must, should, mustNot, filter) -> { filteredLambda.callback(must, filter); }, opLambda); } @@ -98,7 +96,9 @@ public abstract class BsElevateWordCQ extends EsAbstractConditionQuery { ElevateWordCQ filterQuery = new ElevateWordCQ(); boolLambda.callback(mustQuery, shouldQuery, mustNotQuery, filterQuery); if (mustQuery.hasQueries() || shouldQuery.hasQueries() || mustNotQuery.hasQueries() || filterQuery.hasQueries()) { - BoolQueryBuilder builder = regBoolCQ(mustQuery.getQueryBuilderList(), shouldQuery.getQueryBuilderList(), mustNotQuery.getQueryBuilderList(), filterQuery.getQueryBuilderList()); + BoolQueryBuilder builder = + regBoolCQ(mustQuery.getQueryBuilderList(), shouldQuery.getQueryBuilderList(), mustNotQuery.getQueryBuilderList(), + filterQuery.getQueryBuilderList()); if (opLambda != null) { opLambda.callback(builder); } diff --git a/src/main/java/org/codelibs/fess/es/config/cbean/cq/bs/BsElevateWordToLabelCQ.java b/src/main/java/org/codelibs/fess/es/config/cbean/cq/bs/BsElevateWordToLabelCQ.java index 89f5df7b7..729f728cf 100644 --- a/src/main/java/org/codelibs/fess/es/config/cbean/cq/bs/BsElevateWordToLabelCQ.java +++ b/src/main/java/org/codelibs/fess/es/config/cbean/cq/bs/BsElevateWordToLabelCQ.java @@ -15,7 +15,7 @@ */ package org.codelibs.fess.es.config.cbean.cq.bs; -import java.time.*; +import java.time.LocalDateTime; import java.util.Collection; import org.codelibs.fess.es.config.allcommon.EsAbstractConditionQuery; @@ -33,7 +33,6 @@ import org.elasticsearch.index.query.RangeQueryBuilder; import org.elasticsearch.index.query.TermQueryBuilder; import org.elasticsearch.index.query.TermsQueryBuilder; - /** * @author ESFlute (using FreeGen) */ @@ -63,7 +62,7 @@ public abstract class BsElevateWordToLabelCQ extends EsAbstractConditionQuery { public void filtered(FilteredCall filteredLambda, ConditionOptionCall opLambda) { - bool((must, should, mustNot, filter)->{ + bool((must, should, mustNot, filter) -> { filteredLambda.callback(must, filter); }, opLambda); } @@ -98,7 +97,9 @@ public abstract class BsElevateWordToLabelCQ extends EsAbstractConditionQuery { ElevateWordToLabelCQ filterQuery = new ElevateWordToLabelCQ(); boolLambda.callback(mustQuery, shouldQuery, mustNotQuery, filterQuery); if (mustQuery.hasQueries() || shouldQuery.hasQueries() || mustNotQuery.hasQueries() || filterQuery.hasQueries()) { - BoolQueryBuilder builder = regBoolCQ(mustQuery.getQueryBuilderList(), shouldQuery.getQueryBuilderList(), mustNotQuery.getQueryBuilderList(), filterQuery.getQueryBuilderList()); + BoolQueryBuilder builder = + regBoolCQ(mustQuery.getQueryBuilderList(), shouldQuery.getQueryBuilderList(), mustNotQuery.getQueryBuilderList(), + filterQuery.getQueryBuilderList()); if (opLambda != null) { opLambda.callback(builder); } diff --git a/src/main/java/org/codelibs/fess/es/config/cbean/cq/bs/BsFailureUrlCQ.java b/src/main/java/org/codelibs/fess/es/config/cbean/cq/bs/BsFailureUrlCQ.java index d40671b46..f71f589ba 100644 --- a/src/main/java/org/codelibs/fess/es/config/cbean/cq/bs/BsFailureUrlCQ.java +++ b/src/main/java/org/codelibs/fess/es/config/cbean/cq/bs/BsFailureUrlCQ.java @@ -15,7 +15,7 @@ */ package org.codelibs.fess.es.config.cbean.cq.bs; -import java.time.*; +import java.time.LocalDateTime; import java.util.Collection; import org.codelibs.fess.es.config.allcommon.EsAbstractConditionQuery; @@ -33,7 +33,6 @@ import org.elasticsearch.index.query.RangeQueryBuilder; import org.elasticsearch.index.query.TermQueryBuilder; import org.elasticsearch.index.query.TermsQueryBuilder; - /** * @author ESFlute (using FreeGen) */ @@ -61,9 +60,8 @@ public abstract class BsFailureUrlCQ extends EsAbstractConditionQuery { filtered(filteredLambda, null); } - public void filtered(FilteredCall filteredLambda, - ConditionOptionCall opLambda) { - bool((must, should, mustNot, filter)->{ + public void filtered(FilteredCall filteredLambda, ConditionOptionCall opLambda) { + bool((must, should, mustNot, filter) -> { filteredLambda.callback(must, filter); }, opLambda); } @@ -98,7 +96,9 @@ public abstract class BsFailureUrlCQ extends EsAbstractConditionQuery { FailureUrlCQ filterQuery = new FailureUrlCQ(); boolLambda.callback(mustQuery, shouldQuery, mustNotQuery, filterQuery); if (mustQuery.hasQueries() || shouldQuery.hasQueries() || mustNotQuery.hasQueries() || filterQuery.hasQueries()) { - BoolQueryBuilder builder = regBoolCQ(mustQuery.getQueryBuilderList(), shouldQuery.getQueryBuilderList(), mustNotQuery.getQueryBuilderList(), filterQuery.getQueryBuilderList()); + BoolQueryBuilder builder = + regBoolCQ(mustQuery.getQueryBuilderList(), shouldQuery.getQueryBuilderList(), mustNotQuery.getQueryBuilderList(), + filterQuery.getQueryBuilderList()); if (opLambda != null) { opLambda.callback(builder); } diff --git a/src/main/java/org/codelibs/fess/es/config/cbean/cq/bs/BsFileAuthenticationCQ.java b/src/main/java/org/codelibs/fess/es/config/cbean/cq/bs/BsFileAuthenticationCQ.java index 5c651de7e..e2df33832 100644 --- a/src/main/java/org/codelibs/fess/es/config/cbean/cq/bs/BsFileAuthenticationCQ.java +++ b/src/main/java/org/codelibs/fess/es/config/cbean/cq/bs/BsFileAuthenticationCQ.java @@ -15,7 +15,7 @@ */ package org.codelibs.fess.es.config.cbean.cq.bs; -import java.time.*; +import java.time.LocalDateTime; import java.util.Collection; import org.codelibs.fess.es.config.allcommon.EsAbstractConditionQuery; @@ -33,7 +33,6 @@ import org.elasticsearch.index.query.RangeQueryBuilder; import org.elasticsearch.index.query.TermQueryBuilder; import org.elasticsearch.index.query.TermsQueryBuilder; - /** * @author ESFlute (using FreeGen) */ @@ -63,7 +62,7 @@ public abstract class BsFileAuthenticationCQ extends EsAbstractConditionQuery { public void filtered(FilteredCall filteredLambda, ConditionOptionCall opLambda) { - bool((must, should, mustNot, filter)->{ + bool((must, should, mustNot, filter) -> { filteredLambda.callback(must, filter); }, opLambda); } @@ -98,7 +97,9 @@ public abstract class BsFileAuthenticationCQ extends EsAbstractConditionQuery { FileAuthenticationCQ filterQuery = new FileAuthenticationCQ(); boolLambda.callback(mustQuery, shouldQuery, mustNotQuery, filterQuery); if (mustQuery.hasQueries() || shouldQuery.hasQueries() || mustNotQuery.hasQueries() || filterQuery.hasQueries()) { - BoolQueryBuilder builder = regBoolCQ(mustQuery.getQueryBuilderList(), shouldQuery.getQueryBuilderList(), mustNotQuery.getQueryBuilderList(), filterQuery.getQueryBuilderList()); + BoolQueryBuilder builder = + regBoolCQ(mustQuery.getQueryBuilderList(), shouldQuery.getQueryBuilderList(), mustNotQuery.getQueryBuilderList(), + filterQuery.getQueryBuilderList()); if (opLambda != null) { opLambda.callback(builder); } diff --git a/src/main/java/org/codelibs/fess/es/config/cbean/cq/bs/BsFileConfigCQ.java b/src/main/java/org/codelibs/fess/es/config/cbean/cq/bs/BsFileConfigCQ.java index 8e17fc619..59840f2c4 100644 --- a/src/main/java/org/codelibs/fess/es/config/cbean/cq/bs/BsFileConfigCQ.java +++ b/src/main/java/org/codelibs/fess/es/config/cbean/cq/bs/BsFileConfigCQ.java @@ -15,7 +15,7 @@ */ package org.codelibs.fess.es.config.cbean.cq.bs; -import java.time.*; +import java.time.LocalDateTime; import java.util.Collection; import org.codelibs.fess.es.config.allcommon.EsAbstractConditionQuery; @@ -33,7 +33,6 @@ import org.elasticsearch.index.query.RangeQueryBuilder; import org.elasticsearch.index.query.TermQueryBuilder; import org.elasticsearch.index.query.TermsQueryBuilder; - /** * @author ESFlute (using FreeGen) */ @@ -61,9 +60,8 @@ public abstract class BsFileConfigCQ extends EsAbstractConditionQuery { filtered(filteredLambda, null); } - public void filtered(FilteredCall filteredLambda, - ConditionOptionCall opLambda) { - bool((must, should, mustNot, filter)->{ + public void filtered(FilteredCall filteredLambda, ConditionOptionCall opLambda) { + bool((must, should, mustNot, filter) -> { filteredLambda.callback(must, filter); }, opLambda); } @@ -98,7 +96,9 @@ public abstract class BsFileConfigCQ extends EsAbstractConditionQuery { FileConfigCQ filterQuery = new FileConfigCQ(); boolLambda.callback(mustQuery, shouldQuery, mustNotQuery, filterQuery); if (mustQuery.hasQueries() || shouldQuery.hasQueries() || mustNotQuery.hasQueries() || filterQuery.hasQueries()) { - BoolQueryBuilder builder = regBoolCQ(mustQuery.getQueryBuilderList(), shouldQuery.getQueryBuilderList(), mustNotQuery.getQueryBuilderList(), filterQuery.getQueryBuilderList()); + BoolQueryBuilder builder = + regBoolCQ(mustQuery.getQueryBuilderList(), shouldQuery.getQueryBuilderList(), mustNotQuery.getQueryBuilderList(), + filterQuery.getQueryBuilderList()); if (opLambda != null) { opLambda.callback(builder); } diff --git a/src/main/java/org/codelibs/fess/es/config/cbean/cq/bs/BsFileConfigToLabelCQ.java b/src/main/java/org/codelibs/fess/es/config/cbean/cq/bs/BsFileConfigToLabelCQ.java index bcc1aa6a7..4d28a8d82 100644 --- a/src/main/java/org/codelibs/fess/es/config/cbean/cq/bs/BsFileConfigToLabelCQ.java +++ b/src/main/java/org/codelibs/fess/es/config/cbean/cq/bs/BsFileConfigToLabelCQ.java @@ -15,7 +15,7 @@ */ package org.codelibs.fess.es.config.cbean.cq.bs; -import java.time.*; +import java.time.LocalDateTime; import java.util.Collection; import org.codelibs.fess.es.config.allcommon.EsAbstractConditionQuery; @@ -33,7 +33,6 @@ import org.elasticsearch.index.query.RangeQueryBuilder; import org.elasticsearch.index.query.TermQueryBuilder; import org.elasticsearch.index.query.TermsQueryBuilder; - /** * @author ESFlute (using FreeGen) */ @@ -63,7 +62,7 @@ public abstract class BsFileConfigToLabelCQ extends EsAbstractConditionQuery { public void filtered(FilteredCall filteredLambda, ConditionOptionCall opLambda) { - bool((must, should, mustNot, filter)->{ + bool((must, should, mustNot, filter) -> { filteredLambda.callback(must, filter); }, opLambda); } @@ -98,7 +97,9 @@ public abstract class BsFileConfigToLabelCQ extends EsAbstractConditionQuery { FileConfigToLabelCQ filterQuery = new FileConfigToLabelCQ(); boolLambda.callback(mustQuery, shouldQuery, mustNotQuery, filterQuery); if (mustQuery.hasQueries() || shouldQuery.hasQueries() || mustNotQuery.hasQueries() || filterQuery.hasQueries()) { - BoolQueryBuilder builder = regBoolCQ(mustQuery.getQueryBuilderList(), shouldQuery.getQueryBuilderList(), mustNotQuery.getQueryBuilderList(), filterQuery.getQueryBuilderList()); + BoolQueryBuilder builder = + regBoolCQ(mustQuery.getQueryBuilderList(), shouldQuery.getQueryBuilderList(), mustNotQuery.getQueryBuilderList(), + filterQuery.getQueryBuilderList()); if (opLambda != null) { opLambda.callback(builder); } diff --git a/src/main/java/org/codelibs/fess/es/config/cbean/cq/bs/BsFileConfigToRoleCQ.java b/src/main/java/org/codelibs/fess/es/config/cbean/cq/bs/BsFileConfigToRoleCQ.java index a8102693e..73ccb79cf 100644 --- a/src/main/java/org/codelibs/fess/es/config/cbean/cq/bs/BsFileConfigToRoleCQ.java +++ b/src/main/java/org/codelibs/fess/es/config/cbean/cq/bs/BsFileConfigToRoleCQ.java @@ -15,7 +15,7 @@ */ package org.codelibs.fess.es.config.cbean.cq.bs; -import java.time.*; +import java.time.LocalDateTime; import java.util.Collection; import org.codelibs.fess.es.config.allcommon.EsAbstractConditionQuery; @@ -33,7 +33,6 @@ import org.elasticsearch.index.query.RangeQueryBuilder; import org.elasticsearch.index.query.TermQueryBuilder; import org.elasticsearch.index.query.TermsQueryBuilder; - /** * @author ESFlute (using FreeGen) */ @@ -61,9 +60,8 @@ public abstract class BsFileConfigToRoleCQ extends EsAbstractConditionQuery { filtered(filteredLambda, null); } - public void filtered(FilteredCall filteredLambda, - ConditionOptionCall opLambda) { - bool((must, should, mustNot, filter)->{ + public void filtered(FilteredCall filteredLambda, ConditionOptionCall opLambda) { + bool((must, should, mustNot, filter) -> { filteredLambda.callback(must, filter); }, opLambda); } @@ -98,7 +96,9 @@ public abstract class BsFileConfigToRoleCQ extends EsAbstractConditionQuery { FileConfigToRoleCQ filterQuery = new FileConfigToRoleCQ(); boolLambda.callback(mustQuery, shouldQuery, mustNotQuery, filterQuery); if (mustQuery.hasQueries() || shouldQuery.hasQueries() || mustNotQuery.hasQueries() || filterQuery.hasQueries()) { - BoolQueryBuilder builder = regBoolCQ(mustQuery.getQueryBuilderList(), shouldQuery.getQueryBuilderList(), mustNotQuery.getQueryBuilderList(), filterQuery.getQueryBuilderList()); + BoolQueryBuilder builder = + regBoolCQ(mustQuery.getQueryBuilderList(), shouldQuery.getQueryBuilderList(), mustNotQuery.getQueryBuilderList(), + filterQuery.getQueryBuilderList()); if (opLambda != null) { opLambda.callback(builder); } diff --git a/src/main/java/org/codelibs/fess/es/config/cbean/cq/bs/BsJobLogCQ.java b/src/main/java/org/codelibs/fess/es/config/cbean/cq/bs/BsJobLogCQ.java index b92c01005..2c959f612 100644 --- a/src/main/java/org/codelibs/fess/es/config/cbean/cq/bs/BsJobLogCQ.java +++ b/src/main/java/org/codelibs/fess/es/config/cbean/cq/bs/BsJobLogCQ.java @@ -15,7 +15,7 @@ */ package org.codelibs.fess.es.config.cbean.cq.bs; -import java.time.*; +import java.time.LocalDateTime; import java.util.Collection; import org.codelibs.fess.es.config.allcommon.EsAbstractConditionQuery; @@ -33,7 +33,6 @@ import org.elasticsearch.index.query.RangeQueryBuilder; import org.elasticsearch.index.query.TermQueryBuilder; import org.elasticsearch.index.query.TermsQueryBuilder; - /** * @author ESFlute (using FreeGen) */ @@ -61,9 +60,8 @@ public abstract class BsJobLogCQ extends EsAbstractConditionQuery { filtered(filteredLambda, null); } - public void filtered(FilteredCall filteredLambda, - ConditionOptionCall opLambda) { - bool((must, should, mustNot, filter)->{ + public void filtered(FilteredCall filteredLambda, ConditionOptionCall opLambda) { + bool((must, should, mustNot, filter) -> { filteredLambda.callback(must, filter); }, opLambda); } @@ -98,7 +96,9 @@ public abstract class BsJobLogCQ extends EsAbstractConditionQuery { JobLogCQ filterQuery = new JobLogCQ(); boolLambda.callback(mustQuery, shouldQuery, mustNotQuery, filterQuery); if (mustQuery.hasQueries() || shouldQuery.hasQueries() || mustNotQuery.hasQueries() || filterQuery.hasQueries()) { - BoolQueryBuilder builder = regBoolCQ(mustQuery.getQueryBuilderList(), shouldQuery.getQueryBuilderList(), mustNotQuery.getQueryBuilderList(), filterQuery.getQueryBuilderList()); + BoolQueryBuilder builder = + regBoolCQ(mustQuery.getQueryBuilderList(), shouldQuery.getQueryBuilderList(), mustNotQuery.getQueryBuilderList(), + filterQuery.getQueryBuilderList()); if (opLambda != null) { opLambda.callback(builder); } diff --git a/src/main/java/org/codelibs/fess/es/config/cbean/cq/bs/BsKeyMatchCQ.java b/src/main/java/org/codelibs/fess/es/config/cbean/cq/bs/BsKeyMatchCQ.java index 247ff54d3..f3142afda 100644 --- a/src/main/java/org/codelibs/fess/es/config/cbean/cq/bs/BsKeyMatchCQ.java +++ b/src/main/java/org/codelibs/fess/es/config/cbean/cq/bs/BsKeyMatchCQ.java @@ -15,7 +15,7 @@ */ package org.codelibs.fess.es.config.cbean.cq.bs; -import java.time.*; +import java.time.LocalDateTime; import java.util.Collection; import org.codelibs.fess.es.config.allcommon.EsAbstractConditionQuery; @@ -33,7 +33,6 @@ import org.elasticsearch.index.query.RangeQueryBuilder; import org.elasticsearch.index.query.TermQueryBuilder; import org.elasticsearch.index.query.TermsQueryBuilder; - /** * @author ESFlute (using FreeGen) */ @@ -61,9 +60,8 @@ public abstract class BsKeyMatchCQ extends EsAbstractConditionQuery { filtered(filteredLambda, null); } - public void filtered(FilteredCall filteredLambda, - ConditionOptionCall opLambda) { - bool((must, should, mustNot, filter)->{ + public void filtered(FilteredCall filteredLambda, ConditionOptionCall opLambda) { + bool((must, should, mustNot, filter) -> { filteredLambda.callback(must, filter); }, opLambda); } @@ -98,7 +96,9 @@ public abstract class BsKeyMatchCQ extends EsAbstractConditionQuery { KeyMatchCQ filterQuery = new KeyMatchCQ(); boolLambda.callback(mustQuery, shouldQuery, mustNotQuery, filterQuery); if (mustQuery.hasQueries() || shouldQuery.hasQueries() || mustNotQuery.hasQueries() || filterQuery.hasQueries()) { - BoolQueryBuilder builder = regBoolCQ(mustQuery.getQueryBuilderList(), shouldQuery.getQueryBuilderList(), mustNotQuery.getQueryBuilderList(), filterQuery.getQueryBuilderList()); + BoolQueryBuilder builder = + regBoolCQ(mustQuery.getQueryBuilderList(), shouldQuery.getQueryBuilderList(), mustNotQuery.getQueryBuilderList(), + filterQuery.getQueryBuilderList()); if (opLambda != null) { opLambda.callback(builder); } diff --git a/src/main/java/org/codelibs/fess/es/config/cbean/cq/bs/BsLabelToRoleCQ.java b/src/main/java/org/codelibs/fess/es/config/cbean/cq/bs/BsLabelToRoleCQ.java index ac475427e..13d0dffb8 100644 --- a/src/main/java/org/codelibs/fess/es/config/cbean/cq/bs/BsLabelToRoleCQ.java +++ b/src/main/java/org/codelibs/fess/es/config/cbean/cq/bs/BsLabelToRoleCQ.java @@ -15,7 +15,7 @@ */ package org.codelibs.fess.es.config.cbean.cq.bs; -import java.time.*; +import java.time.LocalDateTime; import java.util.Collection; import org.codelibs.fess.es.config.allcommon.EsAbstractConditionQuery; @@ -33,7 +33,6 @@ import org.elasticsearch.index.query.RangeQueryBuilder; import org.elasticsearch.index.query.TermQueryBuilder; import org.elasticsearch.index.query.TermsQueryBuilder; - /** * @author ESFlute (using FreeGen) */ @@ -61,9 +60,8 @@ public abstract class BsLabelToRoleCQ extends EsAbstractConditionQuery { filtered(filteredLambda, null); } - public void filtered(FilteredCall filteredLambda, - ConditionOptionCall opLambda) { - bool((must, should, mustNot, filter)->{ + public void filtered(FilteredCall filteredLambda, ConditionOptionCall opLambda) { + bool((must, should, mustNot, filter) -> { filteredLambda.callback(must, filter); }, opLambda); } @@ -98,7 +96,9 @@ public abstract class BsLabelToRoleCQ extends EsAbstractConditionQuery { LabelToRoleCQ filterQuery = new LabelToRoleCQ(); boolLambda.callback(mustQuery, shouldQuery, mustNotQuery, filterQuery); if (mustQuery.hasQueries() || shouldQuery.hasQueries() || mustNotQuery.hasQueries() || filterQuery.hasQueries()) { - BoolQueryBuilder builder = regBoolCQ(mustQuery.getQueryBuilderList(), shouldQuery.getQueryBuilderList(), mustNotQuery.getQueryBuilderList(), filterQuery.getQueryBuilderList()); + BoolQueryBuilder builder = + regBoolCQ(mustQuery.getQueryBuilderList(), shouldQuery.getQueryBuilderList(), mustNotQuery.getQueryBuilderList(), + filterQuery.getQueryBuilderList()); if (opLambda != null) { opLambda.callback(builder); } diff --git a/src/main/java/org/codelibs/fess/es/config/cbean/cq/bs/BsLabelTypeCQ.java b/src/main/java/org/codelibs/fess/es/config/cbean/cq/bs/BsLabelTypeCQ.java index 2b23edc0f..347985582 100644 --- a/src/main/java/org/codelibs/fess/es/config/cbean/cq/bs/BsLabelTypeCQ.java +++ b/src/main/java/org/codelibs/fess/es/config/cbean/cq/bs/BsLabelTypeCQ.java @@ -15,7 +15,7 @@ */ package org.codelibs.fess.es.config.cbean.cq.bs; -import java.time.*; +import java.time.LocalDateTime; import java.util.Collection; import org.codelibs.fess.es.config.allcommon.EsAbstractConditionQuery; @@ -33,7 +33,6 @@ import org.elasticsearch.index.query.RangeQueryBuilder; import org.elasticsearch.index.query.TermQueryBuilder; import org.elasticsearch.index.query.TermsQueryBuilder; - /** * @author ESFlute (using FreeGen) */ @@ -61,9 +60,8 @@ public abstract class BsLabelTypeCQ extends EsAbstractConditionQuery { filtered(filteredLambda, null); } - public void filtered(FilteredCall filteredLambda, - ConditionOptionCall opLambda) { - bool((must, should, mustNot, filter)->{ + public void filtered(FilteredCall filteredLambda, ConditionOptionCall opLambda) { + bool((must, should, mustNot, filter) -> { filteredLambda.callback(must, filter); }, opLambda); } @@ -98,7 +96,9 @@ public abstract class BsLabelTypeCQ extends EsAbstractConditionQuery { LabelTypeCQ filterQuery = new LabelTypeCQ(); boolLambda.callback(mustQuery, shouldQuery, mustNotQuery, filterQuery); if (mustQuery.hasQueries() || shouldQuery.hasQueries() || mustNotQuery.hasQueries() || filterQuery.hasQueries()) { - BoolQueryBuilder builder = regBoolCQ(mustQuery.getQueryBuilderList(), shouldQuery.getQueryBuilderList(), mustNotQuery.getQueryBuilderList(), filterQuery.getQueryBuilderList()); + BoolQueryBuilder builder = + regBoolCQ(mustQuery.getQueryBuilderList(), shouldQuery.getQueryBuilderList(), mustNotQuery.getQueryBuilderList(), + filterQuery.getQueryBuilderList()); if (opLambda != null) { opLambda.callback(builder); } diff --git a/src/main/java/org/codelibs/fess/es/config/cbean/cq/bs/BsPathMappingCQ.java b/src/main/java/org/codelibs/fess/es/config/cbean/cq/bs/BsPathMappingCQ.java index ef76afb7b..287ccea25 100644 --- a/src/main/java/org/codelibs/fess/es/config/cbean/cq/bs/BsPathMappingCQ.java +++ b/src/main/java/org/codelibs/fess/es/config/cbean/cq/bs/BsPathMappingCQ.java @@ -15,7 +15,7 @@ */ package org.codelibs.fess.es.config.cbean.cq.bs; -import java.time.*; +import java.time.LocalDateTime; import java.util.Collection; import org.codelibs.fess.es.config.allcommon.EsAbstractConditionQuery; @@ -33,7 +33,6 @@ import org.elasticsearch.index.query.RangeQueryBuilder; import org.elasticsearch.index.query.TermQueryBuilder; import org.elasticsearch.index.query.TermsQueryBuilder; - /** * @author ESFlute (using FreeGen) */ @@ -61,9 +60,8 @@ public abstract class BsPathMappingCQ extends EsAbstractConditionQuery { filtered(filteredLambda, null); } - public void filtered(FilteredCall filteredLambda, - ConditionOptionCall opLambda) { - bool((must, should, mustNot, filter)->{ + public void filtered(FilteredCall filteredLambda, ConditionOptionCall opLambda) { + bool((must, should, mustNot, filter) -> { filteredLambda.callback(must, filter); }, opLambda); } @@ -98,7 +96,9 @@ public abstract class BsPathMappingCQ extends EsAbstractConditionQuery { PathMappingCQ filterQuery = new PathMappingCQ(); boolLambda.callback(mustQuery, shouldQuery, mustNotQuery, filterQuery); if (mustQuery.hasQueries() || shouldQuery.hasQueries() || mustNotQuery.hasQueries() || filterQuery.hasQueries()) { - BoolQueryBuilder builder = regBoolCQ(mustQuery.getQueryBuilderList(), shouldQuery.getQueryBuilderList(), mustNotQuery.getQueryBuilderList(), filterQuery.getQueryBuilderList()); + BoolQueryBuilder builder = + regBoolCQ(mustQuery.getQueryBuilderList(), shouldQuery.getQueryBuilderList(), mustNotQuery.getQueryBuilderList(), + filterQuery.getQueryBuilderList()); if (opLambda != null) { opLambda.callback(builder); } diff --git a/src/main/java/org/codelibs/fess/es/config/cbean/cq/bs/BsRequestHeaderCQ.java b/src/main/java/org/codelibs/fess/es/config/cbean/cq/bs/BsRequestHeaderCQ.java index e7c093f30..a363430ad 100644 --- a/src/main/java/org/codelibs/fess/es/config/cbean/cq/bs/BsRequestHeaderCQ.java +++ b/src/main/java/org/codelibs/fess/es/config/cbean/cq/bs/BsRequestHeaderCQ.java @@ -15,7 +15,7 @@ */ package org.codelibs.fess.es.config.cbean.cq.bs; -import java.time.*; +import java.time.LocalDateTime; import java.util.Collection; import org.codelibs.fess.es.config.allcommon.EsAbstractConditionQuery; @@ -33,7 +33,6 @@ import org.elasticsearch.index.query.RangeQueryBuilder; import org.elasticsearch.index.query.TermQueryBuilder; import org.elasticsearch.index.query.TermsQueryBuilder; - /** * @author ESFlute (using FreeGen) */ @@ -61,9 +60,8 @@ public abstract class BsRequestHeaderCQ extends EsAbstractConditionQuery { filtered(filteredLambda, null); } - public void filtered(FilteredCall filteredLambda, - ConditionOptionCall opLambda) { - bool((must, should, mustNot, filter)->{ + public void filtered(FilteredCall filteredLambda, ConditionOptionCall opLambda) { + bool((must, should, mustNot, filter) -> { filteredLambda.callback(must, filter); }, opLambda); } @@ -98,7 +96,9 @@ public abstract class BsRequestHeaderCQ extends EsAbstractConditionQuery { RequestHeaderCQ filterQuery = new RequestHeaderCQ(); boolLambda.callback(mustQuery, shouldQuery, mustNotQuery, filterQuery); if (mustQuery.hasQueries() || shouldQuery.hasQueries() || mustNotQuery.hasQueries() || filterQuery.hasQueries()) { - BoolQueryBuilder builder = regBoolCQ(mustQuery.getQueryBuilderList(), shouldQuery.getQueryBuilderList(), mustNotQuery.getQueryBuilderList(), filterQuery.getQueryBuilderList()); + BoolQueryBuilder builder = + regBoolCQ(mustQuery.getQueryBuilderList(), shouldQuery.getQueryBuilderList(), mustNotQuery.getQueryBuilderList(), + filterQuery.getQueryBuilderList()); if (opLambda != null) { opLambda.callback(builder); } diff --git a/src/main/java/org/codelibs/fess/es/config/cbean/cq/bs/BsRoleTypeCQ.java b/src/main/java/org/codelibs/fess/es/config/cbean/cq/bs/BsRoleTypeCQ.java index 9affc65e6..65ea30952 100644 --- a/src/main/java/org/codelibs/fess/es/config/cbean/cq/bs/BsRoleTypeCQ.java +++ b/src/main/java/org/codelibs/fess/es/config/cbean/cq/bs/BsRoleTypeCQ.java @@ -15,7 +15,7 @@ */ package org.codelibs.fess.es.config.cbean.cq.bs; -import java.time.*; +import java.time.LocalDateTime; import java.util.Collection; import org.codelibs.fess.es.config.allcommon.EsAbstractConditionQuery; @@ -33,7 +33,6 @@ import org.elasticsearch.index.query.RangeQueryBuilder; import org.elasticsearch.index.query.TermQueryBuilder; import org.elasticsearch.index.query.TermsQueryBuilder; - /** * @author ESFlute (using FreeGen) */ @@ -61,9 +60,8 @@ public abstract class BsRoleTypeCQ extends EsAbstractConditionQuery { filtered(filteredLambda, null); } - public void filtered(FilteredCall filteredLambda, - ConditionOptionCall opLambda) { - bool((must, should, mustNot, filter)->{ + public void filtered(FilteredCall filteredLambda, ConditionOptionCall opLambda) { + bool((must, should, mustNot, filter) -> { filteredLambda.callback(must, filter); }, opLambda); } @@ -98,7 +96,9 @@ public abstract class BsRoleTypeCQ extends EsAbstractConditionQuery { RoleTypeCQ filterQuery = new RoleTypeCQ(); boolLambda.callback(mustQuery, shouldQuery, mustNotQuery, filterQuery); if (mustQuery.hasQueries() || shouldQuery.hasQueries() || mustNotQuery.hasQueries() || filterQuery.hasQueries()) { - BoolQueryBuilder builder = regBoolCQ(mustQuery.getQueryBuilderList(), shouldQuery.getQueryBuilderList(), mustNotQuery.getQueryBuilderList(), filterQuery.getQueryBuilderList()); + BoolQueryBuilder builder = + regBoolCQ(mustQuery.getQueryBuilderList(), shouldQuery.getQueryBuilderList(), mustNotQuery.getQueryBuilderList(), + filterQuery.getQueryBuilderList()); if (opLambda != null) { opLambda.callback(builder); } diff --git a/src/main/java/org/codelibs/fess/es/config/cbean/cq/bs/BsScheduledJobCQ.java b/src/main/java/org/codelibs/fess/es/config/cbean/cq/bs/BsScheduledJobCQ.java index 4638b137e..baf11d74d 100644 --- a/src/main/java/org/codelibs/fess/es/config/cbean/cq/bs/BsScheduledJobCQ.java +++ b/src/main/java/org/codelibs/fess/es/config/cbean/cq/bs/BsScheduledJobCQ.java @@ -15,7 +15,7 @@ */ package org.codelibs.fess.es.config.cbean.cq.bs; -import java.time.*; +import java.time.LocalDateTime; import java.util.Collection; import org.codelibs.fess.es.config.allcommon.EsAbstractConditionQuery; @@ -33,7 +33,6 @@ import org.elasticsearch.index.query.RangeQueryBuilder; import org.elasticsearch.index.query.TermQueryBuilder; import org.elasticsearch.index.query.TermsQueryBuilder; - /** * @author ESFlute (using FreeGen) */ @@ -61,9 +60,8 @@ public abstract class BsScheduledJobCQ extends EsAbstractConditionQuery { filtered(filteredLambda, null); } - public void filtered(FilteredCall filteredLambda, - ConditionOptionCall opLambda) { - bool((must, should, mustNot, filter)->{ + public void filtered(FilteredCall filteredLambda, ConditionOptionCall opLambda) { + bool((must, should, mustNot, filter) -> { filteredLambda.callback(must, filter); }, opLambda); } @@ -98,7 +96,9 @@ public abstract class BsScheduledJobCQ extends EsAbstractConditionQuery { ScheduledJobCQ filterQuery = new ScheduledJobCQ(); boolLambda.callback(mustQuery, shouldQuery, mustNotQuery, filterQuery); if (mustQuery.hasQueries() || shouldQuery.hasQueries() || mustNotQuery.hasQueries() || filterQuery.hasQueries()) { - BoolQueryBuilder builder = regBoolCQ(mustQuery.getQueryBuilderList(), shouldQuery.getQueryBuilderList(), mustNotQuery.getQueryBuilderList(), filterQuery.getQueryBuilderList()); + BoolQueryBuilder builder = + regBoolCQ(mustQuery.getQueryBuilderList(), shouldQuery.getQueryBuilderList(), mustNotQuery.getQueryBuilderList(), + filterQuery.getQueryBuilderList()); if (opLambda != null) { opLambda.callback(builder); } diff --git a/src/main/java/org/codelibs/fess/es/config/cbean/cq/bs/BsWebAuthenticationCQ.java b/src/main/java/org/codelibs/fess/es/config/cbean/cq/bs/BsWebAuthenticationCQ.java index 65feeea4d..5148496a3 100644 --- a/src/main/java/org/codelibs/fess/es/config/cbean/cq/bs/BsWebAuthenticationCQ.java +++ b/src/main/java/org/codelibs/fess/es/config/cbean/cq/bs/BsWebAuthenticationCQ.java @@ -15,7 +15,7 @@ */ package org.codelibs.fess.es.config.cbean.cq.bs; -import java.time.*; +import java.time.LocalDateTime; import java.util.Collection; import org.codelibs.fess.es.config.allcommon.EsAbstractConditionQuery; @@ -33,7 +33,6 @@ import org.elasticsearch.index.query.RangeQueryBuilder; import org.elasticsearch.index.query.TermQueryBuilder; import org.elasticsearch.index.query.TermsQueryBuilder; - /** * @author ESFlute (using FreeGen) */ @@ -63,7 +62,7 @@ public abstract class BsWebAuthenticationCQ extends EsAbstractConditionQuery { public void filtered(FilteredCall filteredLambda, ConditionOptionCall opLambda) { - bool((must, should, mustNot, filter)->{ + bool((must, should, mustNot, filter) -> { filteredLambda.callback(must, filter); }, opLambda); } @@ -98,7 +97,9 @@ public abstract class BsWebAuthenticationCQ extends EsAbstractConditionQuery { WebAuthenticationCQ filterQuery = new WebAuthenticationCQ(); boolLambda.callback(mustQuery, shouldQuery, mustNotQuery, filterQuery); if (mustQuery.hasQueries() || shouldQuery.hasQueries() || mustNotQuery.hasQueries() || filterQuery.hasQueries()) { - BoolQueryBuilder builder = regBoolCQ(mustQuery.getQueryBuilderList(), shouldQuery.getQueryBuilderList(), mustNotQuery.getQueryBuilderList(), filterQuery.getQueryBuilderList()); + BoolQueryBuilder builder = + regBoolCQ(mustQuery.getQueryBuilderList(), shouldQuery.getQueryBuilderList(), mustNotQuery.getQueryBuilderList(), + filterQuery.getQueryBuilderList()); if (opLambda != null) { opLambda.callback(builder); } diff --git a/src/main/java/org/codelibs/fess/es/config/cbean/cq/bs/BsWebConfigCQ.java b/src/main/java/org/codelibs/fess/es/config/cbean/cq/bs/BsWebConfigCQ.java index 9a7cbebc6..a41c90845 100644 --- a/src/main/java/org/codelibs/fess/es/config/cbean/cq/bs/BsWebConfigCQ.java +++ b/src/main/java/org/codelibs/fess/es/config/cbean/cq/bs/BsWebConfigCQ.java @@ -15,7 +15,7 @@ */ package org.codelibs.fess.es.config.cbean.cq.bs; -import java.time.*; +import java.time.LocalDateTime; import java.util.Collection; import org.codelibs.fess.es.config.allcommon.EsAbstractConditionQuery; @@ -33,7 +33,6 @@ import org.elasticsearch.index.query.RangeQueryBuilder; import org.elasticsearch.index.query.TermQueryBuilder; import org.elasticsearch.index.query.TermsQueryBuilder; - /** * @author ESFlute (using FreeGen) */ @@ -61,9 +60,8 @@ public abstract class BsWebConfigCQ extends EsAbstractConditionQuery { filtered(filteredLambda, null); } - public void filtered(FilteredCall filteredLambda, - ConditionOptionCall opLambda) { - bool((must, should, mustNot, filter)->{ + public void filtered(FilteredCall filteredLambda, ConditionOptionCall opLambda) { + bool((must, should, mustNot, filter) -> { filteredLambda.callback(must, filter); }, opLambda); } @@ -98,7 +96,9 @@ public abstract class BsWebConfigCQ extends EsAbstractConditionQuery { WebConfigCQ filterQuery = new WebConfigCQ(); boolLambda.callback(mustQuery, shouldQuery, mustNotQuery, filterQuery); if (mustQuery.hasQueries() || shouldQuery.hasQueries() || mustNotQuery.hasQueries() || filterQuery.hasQueries()) { - BoolQueryBuilder builder = regBoolCQ(mustQuery.getQueryBuilderList(), shouldQuery.getQueryBuilderList(), mustNotQuery.getQueryBuilderList(), filterQuery.getQueryBuilderList()); + BoolQueryBuilder builder = + regBoolCQ(mustQuery.getQueryBuilderList(), shouldQuery.getQueryBuilderList(), mustNotQuery.getQueryBuilderList(), + filterQuery.getQueryBuilderList()); if (opLambda != null) { opLambda.callback(builder); } diff --git a/src/main/java/org/codelibs/fess/es/config/cbean/cq/bs/BsWebConfigToLabelCQ.java b/src/main/java/org/codelibs/fess/es/config/cbean/cq/bs/BsWebConfigToLabelCQ.java index 56d2e53b2..330c8d340 100644 --- a/src/main/java/org/codelibs/fess/es/config/cbean/cq/bs/BsWebConfigToLabelCQ.java +++ b/src/main/java/org/codelibs/fess/es/config/cbean/cq/bs/BsWebConfigToLabelCQ.java @@ -15,7 +15,7 @@ */ package org.codelibs.fess.es.config.cbean.cq.bs; -import java.time.*; +import java.time.LocalDateTime; import java.util.Collection; import org.codelibs.fess.es.config.allcommon.EsAbstractConditionQuery; @@ -33,7 +33,6 @@ import org.elasticsearch.index.query.RangeQueryBuilder; import org.elasticsearch.index.query.TermQueryBuilder; import org.elasticsearch.index.query.TermsQueryBuilder; - /** * @author ESFlute (using FreeGen) */ @@ -61,9 +60,8 @@ public abstract class BsWebConfigToLabelCQ extends EsAbstractConditionQuery { filtered(filteredLambda, null); } - public void filtered(FilteredCall filteredLambda, - ConditionOptionCall opLambda) { - bool((must, should, mustNot, filter)->{ + public void filtered(FilteredCall filteredLambda, ConditionOptionCall opLambda) { + bool((must, should, mustNot, filter) -> { filteredLambda.callback(must, filter); }, opLambda); } @@ -98,7 +96,9 @@ public abstract class BsWebConfigToLabelCQ extends EsAbstractConditionQuery { WebConfigToLabelCQ filterQuery = new WebConfigToLabelCQ(); boolLambda.callback(mustQuery, shouldQuery, mustNotQuery, filterQuery); if (mustQuery.hasQueries() || shouldQuery.hasQueries() || mustNotQuery.hasQueries() || filterQuery.hasQueries()) { - BoolQueryBuilder builder = regBoolCQ(mustQuery.getQueryBuilderList(), shouldQuery.getQueryBuilderList(), mustNotQuery.getQueryBuilderList(), filterQuery.getQueryBuilderList()); + BoolQueryBuilder builder = + regBoolCQ(mustQuery.getQueryBuilderList(), shouldQuery.getQueryBuilderList(), mustNotQuery.getQueryBuilderList(), + filterQuery.getQueryBuilderList()); if (opLambda != null) { opLambda.callback(builder); } diff --git a/src/main/java/org/codelibs/fess/es/config/cbean/cq/bs/BsWebConfigToRoleCQ.java b/src/main/java/org/codelibs/fess/es/config/cbean/cq/bs/BsWebConfigToRoleCQ.java index 17dc31a2e..4ff759296 100644 --- a/src/main/java/org/codelibs/fess/es/config/cbean/cq/bs/BsWebConfigToRoleCQ.java +++ b/src/main/java/org/codelibs/fess/es/config/cbean/cq/bs/BsWebConfigToRoleCQ.java @@ -15,7 +15,7 @@ */ package org.codelibs.fess.es.config.cbean.cq.bs; -import java.time.*; +import java.time.LocalDateTime; import java.util.Collection; import org.codelibs.fess.es.config.allcommon.EsAbstractConditionQuery; @@ -33,7 +33,6 @@ import org.elasticsearch.index.query.RangeQueryBuilder; import org.elasticsearch.index.query.TermQueryBuilder; import org.elasticsearch.index.query.TermsQueryBuilder; - /** * @author ESFlute (using FreeGen) */ @@ -61,9 +60,8 @@ public abstract class BsWebConfigToRoleCQ extends EsAbstractConditionQuery { filtered(filteredLambda, null); } - public void filtered(FilteredCall filteredLambda, - ConditionOptionCall opLambda) { - bool((must, should, mustNot, filter)->{ + public void filtered(FilteredCall filteredLambda, ConditionOptionCall opLambda) { + bool((must, should, mustNot, filter) -> { filteredLambda.callback(must, filter); }, opLambda); } @@ -98,7 +96,9 @@ public abstract class BsWebConfigToRoleCQ extends EsAbstractConditionQuery { WebConfigToRoleCQ filterQuery = new WebConfigToRoleCQ(); boolLambda.callback(mustQuery, shouldQuery, mustNotQuery, filterQuery); if (mustQuery.hasQueries() || shouldQuery.hasQueries() || mustNotQuery.hasQueries() || filterQuery.hasQueries()) { - BoolQueryBuilder builder = regBoolCQ(mustQuery.getQueryBuilderList(), shouldQuery.getQueryBuilderList(), mustNotQuery.getQueryBuilderList(), filterQuery.getQueryBuilderList()); + BoolQueryBuilder builder = + regBoolCQ(mustQuery.getQueryBuilderList(), shouldQuery.getQueryBuilderList(), mustNotQuery.getQueryBuilderList(), + filterQuery.getQueryBuilderList()); if (opLambda != null) { opLambda.callback(builder); } diff --git a/src/main/java/org/codelibs/fess/es/log/allcommon/EsAbstractBehavior.java b/src/main/java/org/codelibs/fess/es/log/allcommon/EsAbstractBehavior.java index e85f41319..770d0006f 100644 --- a/src/main/java/org/codelibs/fess/es/log/allcommon/EsAbstractBehavior.java +++ b/src/main/java/org/codelibs/fess/es/log/allcommon/EsAbstractBehavior.java @@ -25,11 +25,8 @@ import java.util.function.Function; import javax.annotation.Resource; -import org.codelibs.fess.es.log.allcommon.EsAbstractEntity; import org.codelibs.fess.es.log.allcommon.EsAbstractEntity.DocMeta; import org.codelibs.fess.es.log.allcommon.EsAbstractEntity.RequestOptionCall; -import org.codelibs.fess.es.log.allcommon.EsAbstractConditionBean; -import org.codelibs.fess.es.log.allcommon.EsPagingResultBean; import org.dbflute.Entity; import org.dbflute.bhv.AbstractBehaviorWritable; import org.dbflute.bhv.readable.EntityRowHandler; @@ -74,8 +71,11 @@ public abstract class EsAbstractBehavior RESULT createEntity(Map source, Class entityType); // =================================================================================== @@ -192,8 +192,9 @@ public abstract class EsAbstractBehavior handler) { - final SearchRequestBuilder builder = client.prepareSearch(asEsIndex()).setTypes(asEsIndexType()).setSearchType(SearchType.SCAN) - .setScroll(scrollForCursor).setSize(sizeForCursor); + final SearchRequestBuilder builder = + client.prepareSearch(asEsIndex()).setTypes(asEsIndexType()).setSearchType(SearchType.SCAN).setScroll(scrollForCursor) + .setSize(sizeForCursor); ((EsAbstractConditionBean) cb).request().build(builder); final SearchResponse response = ((EsAbstractConditionBean) cb).build(builder).execute().actionGet(); @@ -301,8 +302,9 @@ public abstract class EsAbstractBehavior option) { - final SearchRequestBuilder builder = client.prepareSearch(asEsIndex()).setTypes(asEsIndexType()).setSearchType(SearchType.SCAN) - .setScroll(scrollForDelete).setSize(sizeForDelete); + final SearchRequestBuilder builder = + client.prepareSearch(asEsIndex()).setTypes(asEsIndexType()).setSearchType(SearchType.SCAN).setScroll(scrollForDelete) + .setSize(sizeForDelete); ((EsAbstractConditionBean) cb).request().build(builder); final SearchResponse response = ((EsAbstractConditionBean) cb).build(builder).execute().actionGet(); @@ -412,6 +414,7 @@ public abstract class EsAbstractBehavior mustList, List shouldList, List mustNotList, List filterList) { + protected BoolQueryBuilder regBoolCQ(List mustList, List shouldList, List mustNotList, + List filterList) { assertObjectNotNull("mustList", mustList); assertObjectNotNull("shouldList", shouldList); assertObjectNotNull("mustNotList", mustNotList); @@ -272,7 +273,6 @@ 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,4 +479,3 @@ public abstract class EsAbstractConditionQuery implements ConditionQuery { void callback(CQ and); } } - diff --git a/src/main/java/org/codelibs/fess/es/log/allcommon/EsAbstractEntity.java b/src/main/java/org/codelibs/fess/es/log/allcommon/EsAbstractEntity.java index 4297c8a53..9f2965286 100644 --- a/src/main/java/org/codelibs/fess/es/log/allcommon/EsAbstractEntity.java +++ b/src/main/java/org/codelibs/fess/es/log/allcommon/EsAbstractEntity.java @@ -283,4 +283,3 @@ public abstract class EsAbstractEntity implements Entity, Serializable, Cloneabl void callback(OP op); } } - diff --git a/src/main/java/org/codelibs/fess/es/log/allcommon/EsPagingResultBean.java b/src/main/java/org/codelibs/fess/es/log/allcommon/EsPagingResultBean.java index 928777a2d..80392f54a 100644 --- a/src/main/java/org/codelibs/fess/es/log/allcommon/EsPagingResultBean.java +++ b/src/main/java/org/codelibs/fess/es/log/allcommon/EsPagingResultBean.java @@ -62,4 +62,3 @@ public class EsPagingResultBean extends PagingResultBean { this.failedShards = failedShards; } } - diff --git a/src/main/java/org/codelibs/fess/es/log/bsbhv/BsClickLogBhv.java b/src/main/java/org/codelibs/fess/es/log/bsbhv/BsClickLogBhv.java index b4faa457a..4e2278902 100644 --- a/src/main/java/org/codelibs/fess/es/log/bsbhv/BsClickLogBhv.java +++ b/src/main/java/org/codelibs/fess/es/log/bsbhv/BsClickLogBhv.java @@ -103,8 +103,7 @@ public abstract class BsClickLogBhv extends EsAbstractBehavior OptionalEntity doSelectOptionalEntity(ClickLogCB cb, - Class tp) { + protected OptionalEntity doSelectOptionalEntity(ClickLogCB cb, Class tp) { return createOptionalEntity(doSelectEntity(cb, tp), cb); } @@ -172,7 +171,7 @@ public abstract class BsClickLogBhv extends EsAbstractBehavior cbLambda, EntityRowHandler> entityLambda) { - delegateSelectBulk(createCB(cbLambda), entityLambda,typeOfSelectedEntity()); + delegateSelectBulk(createCB(cbLambda), entityLambda, typeOfSelectedEntity()); } // =================================================================================== @@ -267,4 +266,3 @@ public abstract class BsClickLogBhv extends EsAbstractBehavior OptionalEntity doSelectOptionalEntity(FavoriteLogCB cb, - Class tp) { + protected OptionalEntity doSelectOptionalEntity(FavoriteLogCB cb, Class tp) { return createOptionalEntity(doSelectEntity(cb, tp), cb); } @@ -170,7 +169,7 @@ public abstract class BsFavoriteLogBhv extends EsAbstractBehavior cbLambda, EntityRowHandler> entityLambda) { - delegateSelectBulk(createCB(cbLambda), entityLambda,typeOfSelectedEntity()); + delegateSelectBulk(createCB(cbLambda), entityLambda, typeOfSelectedEntity()); } // =================================================================================== @@ -265,4 +264,3 @@ public abstract class BsFavoriteLogBhv extends EsAbstractBehavior OptionalEntity doSelectOptionalEntity(SearchFieldLogCB cb, - Class tp) { + protected OptionalEntity doSelectOptionalEntity(SearchFieldLogCB cb, Class tp) { return createOptionalEntity(doSelectEntity(cb, tp), cb); } @@ -168,7 +167,7 @@ public abstract class BsSearchFieldLogBhv extends EsAbstractBehavior cbLambda, EntityRowHandler> entityLambda) { - delegateSelectBulk(createCB(cbLambda), entityLambda,typeOfSelectedEntity()); + delegateSelectBulk(createCB(cbLambda), entityLambda, typeOfSelectedEntity()); } // =================================================================================== @@ -263,4 +262,3 @@ public abstract class BsSearchFieldLogBhv extends EsAbstractBehavior OptionalEntity doSelectOptionalEntity(SearchLogCB cb, - Class tp) { + protected OptionalEntity doSelectOptionalEntity(SearchLogCB cb, Class tp) { return createOptionalEntity(doSelectEntity(cb, tp), cb); } @@ -181,7 +180,7 @@ public abstract class BsSearchLogBhv extends EsAbstractBehavior cbLambda, EntityRowHandler> entityLambda) { - delegateSelectBulk(createCB(cbLambda), entityLambda,typeOfSelectedEntity()); + delegateSelectBulk(createCB(cbLambda), entityLambda, typeOfSelectedEntity()); } // =================================================================================== @@ -276,4 +275,3 @@ public abstract class BsSearchLogBhv extends EsAbstractBehavior OptionalEntity doSelectOptionalEntity(UserInfoCB cb, - Class tp) { + protected OptionalEntity doSelectOptionalEntity(UserInfoCB cb, Class tp) { return createOptionalEntity(doSelectEntity(cb, tp), cb); } @@ -167,7 +166,7 @@ public abstract class BsUserInfoBhv extends EsAbstractBehavior cbLambda, EntityRowHandler> entityLambda) { - delegateSelectBulk(createCB(cbLambda), entityLambda,typeOfSelectedEntity()); + delegateSelectBulk(createCB(cbLambda), entityLambda, typeOfSelectedEntity()); } // =================================================================================== @@ -262,4 +261,3 @@ public abstract class BsUserInfoBhv extends EsAbstractBehavior _epgMap = newHashMap(); { - setupEpg(_epgMap, et-> ((ClickLog)et).getQueryRequestedAt(),(et,vl)->((ClickLog) et).setQueryRequestedAt(DfTypeUtil.toLocalDateTime(vl)), "queryRequestedAt"); - setupEpg(_epgMap, et-> ((ClickLog)et).getRequestedAt(),(et,vl)->((ClickLog) et).setRequestedAt(DfTypeUtil.toLocalDateTime(vl)), "requestedAt"); - setupEpg(_epgMap, et-> ((ClickLog)et).getQueryId(),(et,vl)->((ClickLog) et).setQueryId(DfTypeUtil.toString(vl)), "queryId"); - setupEpg(_epgMap, et-> ((ClickLog)et).getDocId(),(et,vl)->((ClickLog) et).setDocId(DfTypeUtil.toString(vl)), "docId"); - setupEpg(_epgMap, et-> ((ClickLog)et).getUserSessionId(),(et,vl)->((ClickLog) et).setUserSessionId(DfTypeUtil.toString(vl)), "userSessionId"); - setupEpg(_epgMap, et-> ((ClickLog)et).getUrl(),(et,vl)->((ClickLog) et).setUrl(DfTypeUtil.toString(vl)), "url"); - setupEpg(_epgMap, et-> ((ClickLog)et).getOrder(),(et,vl)->((ClickLog) et).setOrder(DfTypeUtil.toInteger(vl)), "order"); + setupEpg(_epgMap, et -> ((ClickLog) et).getQueryRequestedAt(), + (et, vl) -> ((ClickLog) et).setQueryRequestedAt(DfTypeUtil.toLocalDateTime(vl)), "queryRequestedAt"); + setupEpg(_epgMap, et -> ((ClickLog) et).getRequestedAt(), + (et, vl) -> ((ClickLog) et).setRequestedAt(DfTypeUtil.toLocalDateTime(vl)), "requestedAt"); + setupEpg(_epgMap, et -> ((ClickLog) et).getQueryId(), (et, vl) -> ((ClickLog) et).setQueryId(DfTypeUtil.toString(vl)), "queryId"); + setupEpg(_epgMap, et -> ((ClickLog) et).getDocId(), (et, vl) -> ((ClickLog) et).setDocId(DfTypeUtil.toString(vl)), "docId"); + setupEpg(_epgMap, et -> ((ClickLog) et).getUserSessionId(), (et, vl) -> ((ClickLog) et).setUserSessionId(DfTypeUtil.toString(vl)), + "userSessionId"); + setupEpg(_epgMap, et -> ((ClickLog) et).getUrl(), (et, vl) -> ((ClickLog) et).setUrl(DfTypeUtil.toString(vl)), "url"); + setupEpg(_epgMap, et -> ((ClickLog) et).getOrder(), (et, vl) -> ((ClickLog) et).setOrder(DfTypeUtil.toInteger(vl)), "order"); } @Override @@ -100,32 +102,71 @@ public class ClickLogDbm extends AbstractDBMeta { protected final String _tableDbName = "click_log"; protected final String _tableDispName = "click_log"; protected final String _tablePropertyName = "ClickLog"; - public String getTableDbName() { return _tableDbName; } + + public String getTableDbName() { + return _tableDbName; + } + @Override - public String getTableDispName() { return _tableDispName; } + public String getTableDispName() { + return _tableDispName; + } + @Override - public String getTablePropertyName() { return _tablePropertyName; } + public String getTablePropertyName() { + return _tablePropertyName; + } + @Override - public TableSqlName getTableSqlName() { return null; } + public TableSqlName getTableSqlName() { + return null; + } // =================================================================================== // Column Info // =========== - protected final ColumnInfo _columnQueryRequestedAt = cci("queryRequestedAt", "queryRequestedAt", null, null, LocalDateTime.class, "queryRequestedAt", null, false, false, false, "LocalDateTime", 0, 0, null, false, null, null, null, null, null, false); - protected final ColumnInfo _columnRequestedAt = cci("requestedAt", "requestedAt", null, null, LocalDateTime.class, "requestedAt", null, false, false, false, "LocalDateTime", 0, 0, null, false, null, null, null, null, null, false); - protected final ColumnInfo _columnQueryId = cci("queryId", "queryId", null, null, String.class, "queryId", null, false, false, false, "String", 0, 0, null, false, null, null, null, null, null, false); - protected final ColumnInfo _columnDocId = cci("docId", "docId", null, null, String.class, "docId", null, false, false, false, "String", 0, 0, null, false, null, null, null, null, null, false); - protected final ColumnInfo _columnUserSessionId = cci("userSessionId", "userSessionId", null, null, String.class, "userSessionId", null, false, false, false, "String", 0, 0, null, false, null, null, null, null, null, false); - protected final ColumnInfo _columnUrl = cci("url", "url", null, null, String.class, "url", null, false, false, false, "String", 0, 0, null, false, null, null, null, null, null, false); - protected final ColumnInfo _columnOrder = cci("order", "order", null, null, Integer.class, "order", null, false, false, false, "Integer", 0, 0, null, false, null, null, null, null, null, false); + protected final ColumnInfo _columnQueryRequestedAt = cci("queryRequestedAt", "queryRequestedAt", null, null, LocalDateTime.class, + "queryRequestedAt", null, false, false, false, "LocalDateTime", 0, 0, null, false, null, null, null, null, null, false); + protected final ColumnInfo _columnRequestedAt = cci("requestedAt", "requestedAt", null, null, LocalDateTime.class, "requestedAt", null, + false, false, false, "LocalDateTime", 0, 0, null, false, null, null, null, null, null, false); + protected final ColumnInfo _columnQueryId = cci("queryId", "queryId", null, null, String.class, "queryId", null, false, false, false, + "String", 0, 0, null, false, null, null, null, null, null, false); + protected final ColumnInfo _columnDocId = cci("docId", "docId", null, null, String.class, "docId", null, false, false, false, "String", + 0, 0, null, false, null, null, null, null, null, false); + protected final ColumnInfo _columnUserSessionId = cci("userSessionId", "userSessionId", null, null, String.class, "userSessionId", + null, false, false, false, "String", 0, 0, null, false, null, null, null, null, null, false); + protected final ColumnInfo _columnUrl = cci("url", "url", null, null, String.class, "url", null, false, false, false, "String", 0, 0, + null, false, null, null, null, null, null, false); + protected final ColumnInfo _columnOrder = cci("order", "order", null, null, Integer.class, "order", null, false, false, false, + "Integer", 0, 0, null, false, null, null, null, null, null, false); - public ColumnInfo columnQueryRequestedAt() { return _columnQueryRequestedAt; } - public ColumnInfo columnRequestedAt() { return _columnRequestedAt; } - public ColumnInfo columnQueryId() { return _columnQueryId; } - public ColumnInfo columnDocId() { return _columnDocId; } - public ColumnInfo columnUserSessionId() { return _columnUserSessionId; } - public ColumnInfo columnUrl() { return _columnUrl; } - public ColumnInfo columnOrder() { return _columnOrder; } + public ColumnInfo columnQueryRequestedAt() { + return _columnQueryRequestedAt; + } + + public ColumnInfo columnRequestedAt() { + return _columnRequestedAt; + } + + public ColumnInfo columnQueryId() { + return _columnQueryId; + } + + public ColumnInfo columnDocId() { + return _columnDocId; + } + + public ColumnInfo columnUserSessionId() { + return _columnUserSessionId; + } + + public ColumnInfo columnUrl() { + return _columnUrl; + } + + public ColumnInfo columnOrder() { + return _columnOrder; + } protected List ccil() { List ls = newArrayList(); @@ -212,4 +253,3 @@ public class ClickLogDbm extends AbstractDBMeta { return null; } } - diff --git a/src/main/java/org/codelibs/fess/es/log/bsentity/dbmeta/FavoriteLogDbm.java b/src/main/java/org/codelibs/fess/es/log/bsentity/dbmeta/FavoriteLogDbm.java index 97da1b8cb..b6fcb0601 100644 --- a/src/main/java/org/codelibs/fess/es/log/bsentity/dbmeta/FavoriteLogDbm.java +++ b/src/main/java/org/codelibs/fess/es/log/bsentity/dbmeta/FavoriteLogDbm.java @@ -15,12 +15,11 @@ */ package org.codelibs.fess.es.log.bsentity.dbmeta; -import java.time.*; +import java.time.LocalDateTime; import java.util.List; import java.util.Map; import org.codelibs.fess.es.log.exentity.FavoriteLog; - import org.dbflute.Entity; import org.dbflute.dbmeta.AbstractDBMeta; import org.dbflute.dbmeta.info.ColumnInfo; @@ -80,11 +79,14 @@ public class FavoriteLogDbm extends AbstractDBMeta { // --------------- protected final Map _epgMap = newHashMap(); { - setupEpg(_epgMap, et-> ((FavoriteLog)et).getCreatedAt(),(et,vl)->((FavoriteLog) et).setCreatedAt(DfTypeUtil.toLocalDateTime(vl)), "createdAt"); - setupEpg(_epgMap, et-> ((FavoriteLog)et).getUrl(),(et,vl)->((FavoriteLog) et).setUrl(DfTypeUtil.toString(vl)), "url"); - setupEpg(_epgMap, et-> ((FavoriteLog)et).getDocId(),(et,vl)->((FavoriteLog) et).setDocId(DfTypeUtil.toString(vl)), "docId"); - setupEpg(_epgMap, et-> ((FavoriteLog)et).getQueryId(),(et,vl)->((FavoriteLog) et).setQueryId(DfTypeUtil.toString(vl)), "queryId"); - setupEpg(_epgMap, et-> ((FavoriteLog)et).getUserInfoId(),(et,vl)->((FavoriteLog) et).setUserInfoId(DfTypeUtil.toString(vl)), "userInfoId"); + setupEpg(_epgMap, et -> ((FavoriteLog) et).getCreatedAt(), + (et, vl) -> ((FavoriteLog) et).setCreatedAt(DfTypeUtil.toLocalDateTime(vl)), "createdAt"); + setupEpg(_epgMap, et -> ((FavoriteLog) et).getUrl(), (et, vl) -> ((FavoriteLog) et).setUrl(DfTypeUtil.toString(vl)), "url"); + setupEpg(_epgMap, et -> ((FavoriteLog) et).getDocId(), (et, vl) -> ((FavoriteLog) et).setDocId(DfTypeUtil.toString(vl)), "docId"); + setupEpg(_epgMap, et -> ((FavoriteLog) et).getQueryId(), (et, vl) -> ((FavoriteLog) et).setQueryId(DfTypeUtil.toString(vl)), + "queryId"); + setupEpg(_epgMap, et -> ((FavoriteLog) et).getUserInfoId(), (et, vl) -> ((FavoriteLog) et).setUserInfoId(DfTypeUtil.toString(vl)), + "userInfoId"); } @Override @@ -98,28 +100,59 @@ public class FavoriteLogDbm extends AbstractDBMeta { protected final String _tableDbName = "favorite_log"; protected final String _tableDispName = "favorite_log"; protected final String _tablePropertyName = "FavoriteLog"; - public String getTableDbName() { return _tableDbName; } + + public String getTableDbName() { + return _tableDbName; + } + @Override - public String getTableDispName() { return _tableDispName; } + public String getTableDispName() { + return _tableDispName; + } + @Override - public String getTablePropertyName() { return _tablePropertyName; } + public String getTablePropertyName() { + return _tablePropertyName; + } + @Override - public TableSqlName getTableSqlName() { return null; } + public TableSqlName getTableSqlName() { + return null; + } // =================================================================================== // Column Info // =========== - protected final ColumnInfo _columnCreatedAt = cci("createdAt", "createdAt", null, null, LocalDateTime.class, "createdAt", null, false, false, false, "LocalDateTime", 0, 0, null, false, null, null, null, null, null, false); - protected final ColumnInfo _columnUrl = cci("url", "url", null, null, String.class, "url", null, false, false, false, "String", 0, 0, null, false, null, null, null, null, null, false); - protected final ColumnInfo _columnDocId = cci("docId", "docId", null, null, String.class, "docId", null, false, false, false, "String", 0, 0, null, false, null, null, null, null, null, false); - protected final ColumnInfo _columnQueryId = cci("queryId", "queryId", null, null, String.class, "queryId", null, false, false, false, "String", 0, 0, null, false, null, null, null, null, null, false); - protected final ColumnInfo _columnUserInfoId = cci("userInfoId", "userInfoId", null, null, String.class, "userInfoId", null, false, false, false, "String", 0, 0, null, false, null, null, null, null, null, false); + protected final ColumnInfo _columnCreatedAt = cci("createdAt", "createdAt", null, null, LocalDateTime.class, "createdAt", null, false, + false, false, "LocalDateTime", 0, 0, null, false, null, null, null, null, null, false); + protected final ColumnInfo _columnUrl = cci("url", "url", null, null, String.class, "url", null, false, false, false, "String", 0, 0, + null, false, null, null, null, null, null, false); + protected final ColumnInfo _columnDocId = cci("docId", "docId", null, null, String.class, "docId", null, false, false, false, "String", + 0, 0, null, false, null, null, null, null, null, false); + protected final ColumnInfo _columnQueryId = cci("queryId", "queryId", null, null, String.class, "queryId", null, false, false, false, + "String", 0, 0, null, false, null, null, null, null, null, false); + protected final ColumnInfo _columnUserInfoId = cci("userInfoId", "userInfoId", null, null, String.class, "userInfoId", null, false, + false, false, "String", 0, 0, null, false, null, null, null, null, null, false); - public ColumnInfo columnCreatedAt() { return _columnCreatedAt; } - public ColumnInfo columnUrl() { return _columnUrl; } - public ColumnInfo columnDocId() { return _columnDocId; } - public ColumnInfo columnQueryId() { return _columnQueryId; } - public ColumnInfo columnUserInfoId() { return _columnUserInfoId; } + public ColumnInfo columnCreatedAt() { + return _columnCreatedAt; + } + + public ColumnInfo columnUrl() { + return _columnUrl; + } + + public ColumnInfo columnDocId() { + return _columnDocId; + } + + public ColumnInfo columnQueryId() { + return _columnQueryId; + } + + public ColumnInfo columnUserInfoId() { + return _columnUserInfoId; + } protected List ccil() { List ls = newArrayList(); @@ -204,4 +237,3 @@ public class FavoriteLogDbm extends AbstractDBMeta { return null; } } - diff --git a/src/main/java/org/codelibs/fess/es/log/bsentity/dbmeta/SearchFieldLogDbm.java b/src/main/java/org/codelibs/fess/es/log/bsentity/dbmeta/SearchFieldLogDbm.java index f45646ae9..e6294d9f7 100644 --- a/src/main/java/org/codelibs/fess/es/log/bsentity/dbmeta/SearchFieldLogDbm.java +++ b/src/main/java/org/codelibs/fess/es/log/bsentity/dbmeta/SearchFieldLogDbm.java @@ -15,12 +15,11 @@ */ package org.codelibs.fess.es.log.bsentity.dbmeta; -import java.time.*; +import java.time.LocalDateTime; import java.util.List; import java.util.Map; import org.codelibs.fess.es.log.exentity.SearchFieldLog; - import org.dbflute.Entity; import org.dbflute.dbmeta.AbstractDBMeta; import org.dbflute.dbmeta.info.ColumnInfo; @@ -80,9 +79,11 @@ public class SearchFieldLogDbm extends AbstractDBMeta { // --------------- protected final Map _epgMap = newHashMap(); { - setupEpg(_epgMap, et-> ((SearchFieldLog)et).getName(),(et,vl)->((SearchFieldLog) et).setName(DfTypeUtil.toString(vl)), "name"); - setupEpg(_epgMap, et-> ((SearchFieldLog)et).getSearchLogId(),(et,vl)->((SearchFieldLog) et).setSearchLogId(DfTypeUtil.toString(vl)), "searchLogId"); - setupEpg(_epgMap, et-> ((SearchFieldLog)et).getValue(),(et,vl)->((SearchFieldLog) et).setValue(DfTypeUtil.toString(vl)), "value"); + setupEpg(_epgMap, et -> ((SearchFieldLog) et).getName(), (et, vl) -> ((SearchFieldLog) et).setName(DfTypeUtil.toString(vl)), "name"); + setupEpg(_epgMap, et -> ((SearchFieldLog) et).getSearchLogId(), + (et, vl) -> ((SearchFieldLog) et).setSearchLogId(DfTypeUtil.toString(vl)), "searchLogId"); + setupEpg(_epgMap, et -> ((SearchFieldLog) et).getValue(), (et, vl) -> ((SearchFieldLog) et).setValue(DfTypeUtil.toString(vl)), + "value"); } @Override @@ -96,24 +97,47 @@ public class SearchFieldLogDbm extends AbstractDBMeta { protected final String _tableDbName = "search_field_log"; protected final String _tableDispName = "search_field_log"; protected final String _tablePropertyName = "SearchFieldLog"; - public String getTableDbName() { return _tableDbName; } + + public String getTableDbName() { + return _tableDbName; + } + @Override - public String getTableDispName() { return _tableDispName; } + public String getTableDispName() { + return _tableDispName; + } + @Override - public String getTablePropertyName() { return _tablePropertyName; } + public String getTablePropertyName() { + return _tablePropertyName; + } + @Override - public TableSqlName getTableSqlName() { return null; } + public TableSqlName getTableSqlName() { + return null; + } // =================================================================================== // Column Info // =========== - protected final ColumnInfo _columnName = cci("name", "name", null, null, String.class, "name", null, false, false, false, "String", 0, 0, null, false, null, null, null, null, null, false); - protected final ColumnInfo _columnSearchLogId = cci("searchLogId", "searchLogId", null, null, String.class, "searchLogId", null, false, false, false, "String", 0, 0, null, false, null, null, null, null, null, false); - protected final ColumnInfo _columnValue = cci("value", "value", null, null, String.class, "value", null, false, false, false, "String", 0, 0, null, false, null, null, null, null, null, false); + protected final ColumnInfo _columnName = cci("name", "name", null, null, String.class, "name", null, false, false, false, "String", 0, + 0, null, false, null, null, null, null, null, false); + protected final ColumnInfo _columnSearchLogId = cci("searchLogId", "searchLogId", null, null, String.class, "searchLogId", null, false, + false, false, "String", 0, 0, null, false, null, null, null, null, null, false); + protected final ColumnInfo _columnValue = cci("value", "value", null, null, String.class, "value", null, false, false, false, "String", + 0, 0, null, false, null, null, null, null, null, false); - public ColumnInfo columnName() { return _columnName; } - public ColumnInfo columnSearchLogId() { return _columnSearchLogId; } - public ColumnInfo columnValue() { return _columnValue; } + public ColumnInfo columnName() { + return _columnName; + } + + public ColumnInfo columnSearchLogId() { + return _columnSearchLogId; + } + + public ColumnInfo columnValue() { + return _columnValue; + } protected List ccil() { List ls = newArrayList(); @@ -196,4 +220,3 @@ public class SearchFieldLogDbm extends AbstractDBMeta { return null; } } - diff --git a/src/main/java/org/codelibs/fess/es/log/bsentity/dbmeta/SearchLogDbm.java b/src/main/java/org/codelibs/fess/es/log/bsentity/dbmeta/SearchLogDbm.java index 2495ca35f..c61855300 100644 --- a/src/main/java/org/codelibs/fess/es/log/bsentity/dbmeta/SearchLogDbm.java +++ b/src/main/java/org/codelibs/fess/es/log/bsentity/dbmeta/SearchLogDbm.java @@ -15,12 +15,11 @@ */ package org.codelibs.fess.es.log.bsentity.dbmeta; -import java.time.*; +import java.time.LocalDateTime; import java.util.List; import java.util.Map; import org.codelibs.fess.es.log.exentity.SearchLog; - import org.dbflute.Entity; import org.dbflute.dbmeta.AbstractDBMeta; import org.dbflute.dbmeta.info.ColumnInfo; @@ -80,22 +79,33 @@ public class SearchLogDbm extends AbstractDBMeta { // --------------- protected final Map _epgMap = newHashMap(); { - setupEpg(_epgMap, et-> ((SearchLog)et).getAccessType(),(et,vl)->((SearchLog) et).setAccessType(DfTypeUtil.toString(vl)), "accessType"); - setupEpg(_epgMap, et-> ((SearchLog)et).getUser(),(et,vl)->((SearchLog) et).setUser(DfTypeUtil.toString(vl)), "user"); - setupEpg(_epgMap, et-> ((SearchLog)et).getRoles(),(et,vl)->((SearchLog) et).setRoles((String[])vl), "roles"); - setupEpg(_epgMap, et-> ((SearchLog)et).getQueryId(),(et,vl)->((SearchLog) et).setQueryId(DfTypeUtil.toString(vl)), "queryId"); - setupEpg(_epgMap, et-> ((SearchLog)et).getClientIp(),(et,vl)->((SearchLog) et).setClientIp(DfTypeUtil.toString(vl)), "clientIp"); - setupEpg(_epgMap, et-> ((SearchLog)et).getHitCount(),(et,vl)->((SearchLog) et).setHitCount(DfTypeUtil.toLong(vl)), "hitCount"); - setupEpg(_epgMap, et-> ((SearchLog)et).getQueryOffset(),(et,vl)->((SearchLog) et).setQueryOffset(DfTypeUtil.toInteger(vl)), "queryOffset"); - setupEpg(_epgMap, et-> ((SearchLog)et).getQueryPageSize(),(et,vl)->((SearchLog) et).setQueryPageSize(DfTypeUtil.toInteger(vl)), "queryPageSize"); - setupEpg(_epgMap, et-> ((SearchLog)et).getReferer(),(et,vl)->((SearchLog) et).setReferer(DfTypeUtil.toString(vl)), "referer"); - setupEpg(_epgMap, et-> ((SearchLog)et).getRequestedAt(),(et,vl)->((SearchLog) et).setRequestedAt(DfTypeUtil.toLocalDateTime(vl)), "requestedAt"); - setupEpg(_epgMap, et-> ((SearchLog)et).getResponseTime(),(et,vl)->((SearchLog) et).setResponseTime(DfTypeUtil.toLong(vl)), "responseTime"); - setupEpg(_epgMap, et-> ((SearchLog)et).getQueryTime(),(et,vl)->((SearchLog) et).setQueryTime(DfTypeUtil.toLong(vl)), "queryTime"); - setupEpg(_epgMap, et-> ((SearchLog)et).getSearchWord(),(et,vl)->((SearchLog) et).setSearchWord(DfTypeUtil.toString(vl)), "searchWord"); - setupEpg(_epgMap, et-> ((SearchLog)et).getUserAgent(),(et,vl)->((SearchLog) et).setUserAgent(DfTypeUtil.toString(vl)), "userAgent"); - setupEpg(_epgMap, et-> ((SearchLog)et).getUserInfoId(),(et,vl)->((SearchLog) et).setUserInfoId(DfTypeUtil.toString(vl)), "userInfoId"); - setupEpg(_epgMap, et-> ((SearchLog)et).getUserSessionId(),(et,vl)->((SearchLog) et).setUserSessionId(DfTypeUtil.toString(vl)), "userSessionId"); + setupEpg(_epgMap, et -> ((SearchLog) et).getAccessType(), (et, vl) -> ((SearchLog) et).setAccessType(DfTypeUtil.toString(vl)), + "accessType"); + setupEpg(_epgMap, et -> ((SearchLog) et).getUser(), (et, vl) -> ((SearchLog) et).setUser(DfTypeUtil.toString(vl)), "user"); + setupEpg(_epgMap, et -> ((SearchLog) et).getRoles(), (et, vl) -> ((SearchLog) et).setRoles((String[]) vl), "roles"); + setupEpg(_epgMap, et -> ((SearchLog) et).getQueryId(), (et, vl) -> ((SearchLog) et).setQueryId(DfTypeUtil.toString(vl)), "queryId"); + setupEpg(_epgMap, et -> ((SearchLog) et).getClientIp(), (et, vl) -> ((SearchLog) et).setClientIp(DfTypeUtil.toString(vl)), + "clientIp"); + setupEpg(_epgMap, et -> ((SearchLog) et).getHitCount(), (et, vl) -> ((SearchLog) et).setHitCount(DfTypeUtil.toLong(vl)), "hitCount"); + setupEpg(_epgMap, et -> ((SearchLog) et).getQueryOffset(), (et, vl) -> ((SearchLog) et).setQueryOffset(DfTypeUtil.toInteger(vl)), + "queryOffset"); + setupEpg(_epgMap, et -> ((SearchLog) et).getQueryPageSize(), + (et, vl) -> ((SearchLog) et).setQueryPageSize(DfTypeUtil.toInteger(vl)), "queryPageSize"); + setupEpg(_epgMap, et -> ((SearchLog) et).getReferer(), (et, vl) -> ((SearchLog) et).setReferer(DfTypeUtil.toString(vl)), "referer"); + setupEpg(_epgMap, et -> ((SearchLog) et).getRequestedAt(), + (et, vl) -> ((SearchLog) et).setRequestedAt(DfTypeUtil.toLocalDateTime(vl)), "requestedAt"); + setupEpg(_epgMap, et -> ((SearchLog) et).getResponseTime(), (et, vl) -> ((SearchLog) et).setResponseTime(DfTypeUtil.toLong(vl)), + "responseTime"); + setupEpg(_epgMap, et -> ((SearchLog) et).getQueryTime(), (et, vl) -> ((SearchLog) et).setQueryTime(DfTypeUtil.toLong(vl)), + "queryTime"); + setupEpg(_epgMap, et -> ((SearchLog) et).getSearchWord(), (et, vl) -> ((SearchLog) et).setSearchWord(DfTypeUtil.toString(vl)), + "searchWord"); + setupEpg(_epgMap, et -> ((SearchLog) et).getUserAgent(), (et, vl) -> ((SearchLog) et).setUserAgent(DfTypeUtil.toString(vl)), + "userAgent"); + setupEpg(_epgMap, et -> ((SearchLog) et).getUserInfoId(), (et, vl) -> ((SearchLog) et).setUserInfoId(DfTypeUtil.toString(vl)), + "userInfoId"); + setupEpg(_epgMap, et -> ((SearchLog) et).getUserSessionId(), + (et, vl) -> ((SearchLog) et).setUserSessionId(DfTypeUtil.toString(vl)), "userSessionId"); } @Override @@ -109,50 +119,125 @@ public class SearchLogDbm extends AbstractDBMeta { protected final String _tableDbName = "search_log"; protected final String _tableDispName = "search_log"; protected final String _tablePropertyName = "SearchLog"; - public String getTableDbName() { return _tableDbName; } + + public String getTableDbName() { + return _tableDbName; + } + @Override - public String getTableDispName() { return _tableDispName; } + public String getTableDispName() { + return _tableDispName; + } + @Override - public String getTablePropertyName() { return _tablePropertyName; } + public String getTablePropertyName() { + return _tablePropertyName; + } + @Override - public TableSqlName getTableSqlName() { return null; } + public TableSqlName getTableSqlName() { + return null; + } // =================================================================================== // Column Info // =========== - protected final ColumnInfo _columnAccessType = cci("accessType", "accessType", null, null, String.class, "accessType", null, false, false, false, "String", 0, 0, null, false, null, null, null, null, null, false); - protected final ColumnInfo _columnUser = cci("user", "user", null, null, String.class, "user", null, false, false, false, "String", 0, 0, null, false, null, null, null, null, null, false); - protected final ColumnInfo _columnRoles = cci("roles", "roles", null, null, String[].class, "roles", null, false, false, false, "String", 0, 0, null, false, null, null, null, null, null, false); - protected final ColumnInfo _columnQueryId = cci("queryId", "queryId", null, null, String.class, "queryId", null, false, false, false, "String", 0, 0, null, false, null, null, null, null, null, false); - protected final ColumnInfo _columnClientIp = cci("clientIp", "clientIp", null, null, String.class, "clientIp", null, false, false, false, "String", 0, 0, null, false, null, null, null, null, null, false); - protected final ColumnInfo _columnHitCount = cci("hitCount", "hitCount", null, null, Long.class, "hitCount", null, false, false, false, "Long", 0, 0, null, false, null, null, null, null, null, false); - protected final ColumnInfo _columnQueryOffset = cci("queryOffset", "queryOffset", null, null, Integer.class, "queryOffset", null, false, false, false, "Integer", 0, 0, null, false, null, null, null, null, null, false); - protected final ColumnInfo _columnQueryPageSize = cci("queryPageSize", "queryPageSize", null, null, Integer.class, "queryPageSize", null, false, false, false, "Integer", 0, 0, null, false, null, null, null, null, null, false); - protected final ColumnInfo _columnReferer = cci("referer", "referer", null, null, String.class, "referer", null, false, false, false, "String", 0, 0, null, false, null, null, null, null, null, false); - protected final ColumnInfo _columnRequestedAt = cci("requestedAt", "requestedAt", null, null, LocalDateTime.class, "requestedAt", null, false, false, false, "LocalDateTime", 0, 0, null, false, null, null, null, null, null, false); - protected final ColumnInfo _columnResponseTime = cci("responseTime", "responseTime", null, null, Long.class, "responseTime", null, false, false, false, "Long", 0, 0, null, false, null, null, null, null, null, false); - protected final ColumnInfo _columnQueryTime = cci("queryTime", "queryTime", null, null, Long.class, "queryTime", null, false, false, false, "Long", 0, 0, null, false, null, null, null, null, null, false); - protected final ColumnInfo _columnSearchWord = cci("searchWord", "searchWord", null, null, String.class, "searchWord", null, false, false, false, "String", 0, 0, null, false, null, null, null, null, null, false); - protected final ColumnInfo _columnUserAgent = cci("userAgent", "userAgent", null, null, String.class, "userAgent", null, false, false, false, "String", 0, 0, null, false, null, null, null, null, null, false); - protected final ColumnInfo _columnUserInfoId = cci("userInfoId", "userInfoId", null, null, String.class, "userInfoId", null, false, false, false, "String", 0, 0, null, false, null, null, null, null, null, false); - protected final ColumnInfo _columnUserSessionId = cci("userSessionId", "userSessionId", null, null, String.class, "userSessionId", null, false, false, false, "String", 0, 0, null, false, null, null, null, null, null, false); + protected final ColumnInfo _columnAccessType = cci("accessType", "accessType", null, null, String.class, "accessType", null, false, + false, false, "String", 0, 0, null, false, null, null, null, null, null, false); + protected final ColumnInfo _columnUser = cci("user", "user", null, null, String.class, "user", null, false, false, false, "String", 0, + 0, null, false, null, null, null, null, null, false); + protected final ColumnInfo _columnRoles = cci("roles", "roles", null, null, String[].class, "roles", null, false, false, false, + "String", 0, 0, null, false, null, null, null, null, null, false); + protected final ColumnInfo _columnQueryId = cci("queryId", "queryId", null, null, String.class, "queryId", null, false, false, false, + "String", 0, 0, null, false, null, null, null, null, null, false); + protected final ColumnInfo _columnClientIp = cci("clientIp", "clientIp", null, null, String.class, "clientIp", null, false, false, + false, "String", 0, 0, null, false, null, null, null, null, null, false); + protected final ColumnInfo _columnHitCount = cci("hitCount", "hitCount", null, null, Long.class, "hitCount", null, false, false, false, + "Long", 0, 0, null, false, null, null, null, null, null, false); + protected final ColumnInfo _columnQueryOffset = cci("queryOffset", "queryOffset", null, null, Integer.class, "queryOffset", null, + false, false, false, "Integer", 0, 0, null, false, null, null, null, null, null, false); + protected final ColumnInfo _columnQueryPageSize = cci("queryPageSize", "queryPageSize", null, null, Integer.class, "queryPageSize", + null, false, false, false, "Integer", 0, 0, null, false, null, null, null, null, null, false); + protected final ColumnInfo _columnReferer = cci("referer", "referer", null, null, String.class, "referer", null, false, false, false, + "String", 0, 0, null, false, null, null, null, null, null, false); + protected final ColumnInfo _columnRequestedAt = cci("requestedAt", "requestedAt", null, null, LocalDateTime.class, "requestedAt", null, + false, false, false, "LocalDateTime", 0, 0, null, false, null, null, null, null, null, false); + protected final ColumnInfo _columnResponseTime = cci("responseTime", "responseTime", null, null, Long.class, "responseTime", null, + false, false, false, "Long", 0, 0, null, false, null, null, null, null, null, false); + protected final ColumnInfo _columnQueryTime = cci("queryTime", "queryTime", null, null, Long.class, "queryTime", null, false, false, + false, "Long", 0, 0, null, false, null, null, null, null, null, false); + protected final ColumnInfo _columnSearchWord = cci("searchWord", "searchWord", null, null, String.class, "searchWord", null, false, + false, false, "String", 0, 0, null, false, null, null, null, null, null, false); + protected final ColumnInfo _columnUserAgent = cci("userAgent", "userAgent", null, null, String.class, "userAgent", null, false, false, + false, "String", 0, 0, null, false, null, null, null, null, null, false); + protected final ColumnInfo _columnUserInfoId = cci("userInfoId", "userInfoId", null, null, String.class, "userInfoId", null, false, + false, false, "String", 0, 0, null, false, null, null, null, null, null, false); + protected final ColumnInfo _columnUserSessionId = cci("userSessionId", "userSessionId", null, null, String.class, "userSessionId", + null, false, false, false, "String", 0, 0, null, false, null, null, null, null, null, false); - public ColumnInfo columnAccessType() { return _columnAccessType; } - public ColumnInfo columnUser() { return _columnUser; } - public ColumnInfo columnRoles() { return _columnRoles; } - public ColumnInfo columnQueryId() { return _columnQueryId; } - public ColumnInfo columnClientIp() { return _columnClientIp; } - public ColumnInfo columnHitCount() { return _columnHitCount; } - public ColumnInfo columnQueryOffset() { return _columnQueryOffset; } - public ColumnInfo columnQueryPageSize() { return _columnQueryPageSize; } - public ColumnInfo columnReferer() { return _columnReferer; } - public ColumnInfo columnRequestedAt() { return _columnRequestedAt; } - public ColumnInfo columnResponseTime() { return _columnResponseTime; } - public ColumnInfo columnQueryTime() { return _columnQueryTime; } - public ColumnInfo columnSearchWord() { return _columnSearchWord; } - public ColumnInfo columnUserAgent() { return _columnUserAgent; } - public ColumnInfo columnUserInfoId() { return _columnUserInfoId; } - public ColumnInfo columnUserSessionId() { return _columnUserSessionId; } + public ColumnInfo columnAccessType() { + return _columnAccessType; + } + + public ColumnInfo columnUser() { + return _columnUser; + } + + public ColumnInfo columnRoles() { + return _columnRoles; + } + + public ColumnInfo columnQueryId() { + return _columnQueryId; + } + + public ColumnInfo columnClientIp() { + return _columnClientIp; + } + + public ColumnInfo columnHitCount() { + return _columnHitCount; + } + + public ColumnInfo columnQueryOffset() { + return _columnQueryOffset; + } + + public ColumnInfo columnQueryPageSize() { + return _columnQueryPageSize; + } + + public ColumnInfo columnReferer() { + return _columnReferer; + } + + public ColumnInfo columnRequestedAt() { + return _columnRequestedAt; + } + + public ColumnInfo columnResponseTime() { + return _columnResponseTime; + } + + public ColumnInfo columnQueryTime() { + return _columnQueryTime; + } + + public ColumnInfo columnSearchWord() { + return _columnSearchWord; + } + + public ColumnInfo columnUserAgent() { + return _columnUserAgent; + } + + public ColumnInfo columnUserInfoId() { + return _columnUserInfoId; + } + + public ColumnInfo columnUserSessionId() { + return _columnUserSessionId; + } protected List ccil() { List ls = newArrayList(); @@ -248,4 +333,3 @@ public class SearchLogDbm extends AbstractDBMeta { return null; } } - diff --git a/src/main/java/org/codelibs/fess/es/log/bsentity/dbmeta/UserInfoDbm.java b/src/main/java/org/codelibs/fess/es/log/bsentity/dbmeta/UserInfoDbm.java index 77bbd2bc8..f01115f6d 100644 --- a/src/main/java/org/codelibs/fess/es/log/bsentity/dbmeta/UserInfoDbm.java +++ b/src/main/java/org/codelibs/fess/es/log/bsentity/dbmeta/UserInfoDbm.java @@ -15,12 +15,11 @@ */ package org.codelibs.fess.es.log.bsentity.dbmeta; -import java.time.*; +import java.time.LocalDateTime; import java.util.List; import java.util.Map; import org.codelibs.fess.es.log.exentity.UserInfo; - import org.dbflute.Entity; import org.dbflute.dbmeta.AbstractDBMeta; import org.dbflute.dbmeta.info.ColumnInfo; @@ -80,8 +79,10 @@ public class UserInfoDbm extends AbstractDBMeta { // --------------- protected final Map _epgMap = newHashMap(); { - setupEpg(_epgMap, et-> ((UserInfo)et).getCreatedAt(),(et,vl)->((UserInfo) et).setCreatedAt(DfTypeUtil.toLocalDateTime(vl)), "createdAt"); - setupEpg(_epgMap, et-> ((UserInfo)et).getUpdatedAt(),(et,vl)->((UserInfo) et).setUpdatedAt(DfTypeUtil.toLocalDateTime(vl)), "updatedAt"); + setupEpg(_epgMap, et -> ((UserInfo) et).getCreatedAt(), (et, vl) -> ((UserInfo) et).setCreatedAt(DfTypeUtil.toLocalDateTime(vl)), + "createdAt"); + setupEpg(_epgMap, et -> ((UserInfo) et).getUpdatedAt(), (et, vl) -> ((UserInfo) et).setUpdatedAt(DfTypeUtil.toLocalDateTime(vl)), + "updatedAt"); } @Override @@ -95,22 +96,41 @@ public class UserInfoDbm extends AbstractDBMeta { protected final String _tableDbName = "user_info"; protected final String _tableDispName = "user_info"; protected final String _tablePropertyName = "UserInfo"; - public String getTableDbName() { return _tableDbName; } + + public String getTableDbName() { + return _tableDbName; + } + @Override - public String getTableDispName() { return _tableDispName; } + public String getTableDispName() { + return _tableDispName; + } + @Override - public String getTablePropertyName() { return _tablePropertyName; } + public String getTablePropertyName() { + return _tablePropertyName; + } + @Override - public TableSqlName getTableSqlName() { return null; } + public TableSqlName getTableSqlName() { + return null; + } // =================================================================================== // Column Info // =========== - protected final ColumnInfo _columnCreatedAt = cci("createdAt", "createdAt", null, null, LocalDateTime.class, "createdAt", null, false, false, false, "LocalDateTime", 0, 0, null, false, null, null, null, null, null, false); - protected final ColumnInfo _columnUpdatedAt = cci("updatedAt", "updatedAt", null, null, LocalDateTime.class, "updatedAt", null, false, false, false, "LocalDateTime", 0, 0, null, false, null, null, null, null, null, false); + protected final ColumnInfo _columnCreatedAt = cci("createdAt", "createdAt", null, null, LocalDateTime.class, "createdAt", null, false, + false, false, "LocalDateTime", 0, 0, null, false, null, null, null, null, null, false); + protected final ColumnInfo _columnUpdatedAt = cci("updatedAt", "updatedAt", null, null, LocalDateTime.class, "updatedAt", null, false, + false, false, "LocalDateTime", 0, 0, null, false, null, null, null, null, null, false); - public ColumnInfo columnCreatedAt() { return _columnCreatedAt; } - public ColumnInfo columnUpdatedAt() { return _columnUpdatedAt; } + public ColumnInfo columnCreatedAt() { + return _columnCreatedAt; + } + + public ColumnInfo columnUpdatedAt() { + return _columnUpdatedAt; + } protected List ccil() { List ls = newArrayList(); @@ -192,4 +212,3 @@ public class UserInfoDbm extends AbstractDBMeta { return null; } } - diff --git a/src/main/java/org/codelibs/fess/es/log/cbean/bs/BsClickLogCB.java b/src/main/java/org/codelibs/fess/es/log/cbean/bs/BsClickLogCB.java index 75ab72824..62a9f474a 100644 --- a/src/main/java/org/codelibs/fess/es/log/cbean/bs/BsClickLogCB.java +++ b/src/main/java/org/codelibs/fess/es/log/cbean/bs/BsClickLogCB.java @@ -75,7 +75,7 @@ public class BsClickLogCB extends EsAbstractConditionBean { @Override public void acceptPrimaryKeyMap(Map primaryKeyMap) { - acceptPK((String)primaryKeyMap.get("_id")); + acceptPK((String) primaryKeyMap.get("_id")); } // =================================================================================== @@ -161,21 +161,27 @@ public class BsClickLogCB extends EsAbstractConditionBean { public void columnQueryRequestedAt() { doColumn("queryRequestedAt"); } + public void columnRequestedAt() { doColumn("requestedAt"); } + public void columnQueryId() { doColumn("queryId"); } + public void columnDocId() { doColumn("docId"); } + public void columnUserSessionId() { doColumn("userSessionId"); } + public void columnUrl() { doColumn("url"); } + public void columnOrder() { doColumn("order"); } diff --git a/src/main/java/org/codelibs/fess/es/log/cbean/bs/BsFavoriteLogCB.java b/src/main/java/org/codelibs/fess/es/log/cbean/bs/BsFavoriteLogCB.java index fbcc00d21..df1e3669f 100644 --- a/src/main/java/org/codelibs/fess/es/log/cbean/bs/BsFavoriteLogCB.java +++ b/src/main/java/org/codelibs/fess/es/log/cbean/bs/BsFavoriteLogCB.java @@ -75,7 +75,7 @@ public class BsFavoriteLogCB extends EsAbstractConditionBean { @Override public void acceptPrimaryKeyMap(Map primaryKeyMap) { - acceptPK((String)primaryKeyMap.get("_id")); + acceptPK((String) primaryKeyMap.get("_id")); } // =================================================================================== @@ -161,15 +161,19 @@ public class BsFavoriteLogCB extends EsAbstractConditionBean { public void columnCreatedAt() { doColumn("createdAt"); } + public void columnUrl() { doColumn("url"); } + public void columnDocId() { doColumn("docId"); } + public void columnQueryId() { doColumn("queryId"); } + public void columnUserInfoId() { doColumn("userInfoId"); } diff --git a/src/main/java/org/codelibs/fess/es/log/cbean/bs/BsSearchFieldLogCB.java b/src/main/java/org/codelibs/fess/es/log/cbean/bs/BsSearchFieldLogCB.java index eb230092d..0f45e6a7b 100644 --- a/src/main/java/org/codelibs/fess/es/log/cbean/bs/BsSearchFieldLogCB.java +++ b/src/main/java/org/codelibs/fess/es/log/cbean/bs/BsSearchFieldLogCB.java @@ -75,7 +75,7 @@ public class BsSearchFieldLogCB extends EsAbstractConditionBean { @Override public void acceptPrimaryKeyMap(Map primaryKeyMap) { - acceptPK((String)primaryKeyMap.get("_id")); + acceptPK((String) primaryKeyMap.get("_id")); } // =================================================================================== @@ -161,9 +161,11 @@ public class BsSearchFieldLogCB extends EsAbstractConditionBean { public void columnName() { doColumn("name"); } + public void columnSearchLogId() { doColumn("searchLogId"); } + public void columnValue() { doColumn("value"); } diff --git a/src/main/java/org/codelibs/fess/es/log/cbean/bs/BsSearchLogCB.java b/src/main/java/org/codelibs/fess/es/log/cbean/bs/BsSearchLogCB.java index e1c688acf..d85c60942 100644 --- a/src/main/java/org/codelibs/fess/es/log/cbean/bs/BsSearchLogCB.java +++ b/src/main/java/org/codelibs/fess/es/log/cbean/bs/BsSearchLogCB.java @@ -75,7 +75,7 @@ public class BsSearchLogCB extends EsAbstractConditionBean { @Override public void acceptPrimaryKeyMap(Map primaryKeyMap) { - acceptPK((String)primaryKeyMap.get("_id")); + acceptPK((String) primaryKeyMap.get("_id")); } // =================================================================================== @@ -161,48 +161,63 @@ public class BsSearchLogCB extends EsAbstractConditionBean { public void columnAccessType() { doColumn("accessType"); } + public void columnUser() { doColumn("user"); } + public void columnRoles() { doColumn("roles"); } + public void columnQueryId() { doColumn("queryId"); } + public void columnClientIp() { doColumn("clientIp"); } + public void columnHitCount() { doColumn("hitCount"); } + public void columnQueryOffset() { doColumn("queryOffset"); } + public void columnQueryPageSize() { doColumn("queryPageSize"); } + public void columnReferer() { doColumn("referer"); } + public void columnRequestedAt() { doColumn("requestedAt"); } + public void columnResponseTime() { doColumn("responseTime"); } + public void columnQueryTime() { doColumn("queryTime"); } + public void columnSearchWord() { doColumn("searchWord"); } + public void columnUserAgent() { doColumn("userAgent"); } + public void columnUserInfoId() { doColumn("userInfoId"); } + public void columnUserSessionId() { doColumn("userSessionId"); } diff --git a/src/main/java/org/codelibs/fess/es/log/cbean/bs/BsUserInfoCB.java b/src/main/java/org/codelibs/fess/es/log/cbean/bs/BsUserInfoCB.java index 5849daeed..c63fdbfd9 100644 --- a/src/main/java/org/codelibs/fess/es/log/cbean/bs/BsUserInfoCB.java +++ b/src/main/java/org/codelibs/fess/es/log/cbean/bs/BsUserInfoCB.java @@ -75,7 +75,7 @@ public class BsUserInfoCB extends EsAbstractConditionBean { @Override public void acceptPrimaryKeyMap(Map primaryKeyMap) { - acceptPK((String)primaryKeyMap.get("_id")); + acceptPK((String) primaryKeyMap.get("_id")); } // =================================================================================== @@ -161,6 +161,7 @@ public class BsUserInfoCB extends EsAbstractConditionBean { public void columnCreatedAt() { doColumn("createdAt"); } + public void columnUpdatedAt() { doColumn("updatedAt"); } diff --git a/src/main/java/org/codelibs/fess/es/log/cbean/cq/bs/BsClickLogCQ.java b/src/main/java/org/codelibs/fess/es/log/cbean/cq/bs/BsClickLogCQ.java index 6ca545443..ca65c6799 100644 --- a/src/main/java/org/codelibs/fess/es/log/cbean/cq/bs/BsClickLogCQ.java +++ b/src/main/java/org/codelibs/fess/es/log/cbean/cq/bs/BsClickLogCQ.java @@ -15,7 +15,7 @@ */ package org.codelibs.fess.es.log.cbean.cq.bs; -import java.time.*; +import java.time.LocalDateTime; import java.util.Collection; import org.codelibs.fess.es.log.allcommon.EsAbstractConditionQuery; @@ -33,7 +33,6 @@ import org.elasticsearch.index.query.RangeQueryBuilder; import org.elasticsearch.index.query.TermQueryBuilder; import org.elasticsearch.index.query.TermsQueryBuilder; - /** * @author ESFlute (using FreeGen) */ @@ -61,9 +60,8 @@ public abstract class BsClickLogCQ extends EsAbstractConditionQuery { filtered(filteredLambda, null); } - public void filtered(FilteredCall filteredLambda, - ConditionOptionCall opLambda) { - bool((must, should, mustNot, filter)->{ + public void filtered(FilteredCall filteredLambda, ConditionOptionCall opLambda) { + bool((must, should, mustNot, filter) -> { filteredLambda.callback(must, filter); }, opLambda); } @@ -98,7 +96,9 @@ public abstract class BsClickLogCQ extends EsAbstractConditionQuery { ClickLogCQ filterQuery = new ClickLogCQ(); boolLambda.callback(mustQuery, shouldQuery, mustNotQuery, filterQuery); if (mustQuery.hasQueries() || shouldQuery.hasQueries() || mustNotQuery.hasQueries() || filterQuery.hasQueries()) { - BoolQueryBuilder builder = regBoolCQ(mustQuery.getQueryBuilderList(), shouldQuery.getQueryBuilderList(), mustNotQuery.getQueryBuilderList(), filterQuery.getQueryBuilderList()); + BoolQueryBuilder builder = + regBoolCQ(mustQuery.getQueryBuilderList(), shouldQuery.getQueryBuilderList(), mustNotQuery.getQueryBuilderList(), + filterQuery.getQueryBuilderList()); if (opLambda != null) { opLambda.callback(builder); } diff --git a/src/main/java/org/codelibs/fess/es/log/cbean/cq/bs/BsFavoriteLogCQ.java b/src/main/java/org/codelibs/fess/es/log/cbean/cq/bs/BsFavoriteLogCQ.java index f613953ed..d24bce504 100644 --- a/src/main/java/org/codelibs/fess/es/log/cbean/cq/bs/BsFavoriteLogCQ.java +++ b/src/main/java/org/codelibs/fess/es/log/cbean/cq/bs/BsFavoriteLogCQ.java @@ -15,7 +15,7 @@ */ package org.codelibs.fess.es.log.cbean.cq.bs; -import java.time.*; +import java.time.LocalDateTime; import java.util.Collection; import org.codelibs.fess.es.log.allcommon.EsAbstractConditionQuery; @@ -33,7 +33,6 @@ import org.elasticsearch.index.query.RangeQueryBuilder; import org.elasticsearch.index.query.TermQueryBuilder; import org.elasticsearch.index.query.TermsQueryBuilder; - /** * @author ESFlute (using FreeGen) */ @@ -61,9 +60,8 @@ public abstract class BsFavoriteLogCQ extends EsAbstractConditionQuery { filtered(filteredLambda, null); } - public void filtered(FilteredCall filteredLambda, - ConditionOptionCall opLambda) { - bool((must, should, mustNot, filter)->{ + public void filtered(FilteredCall filteredLambda, ConditionOptionCall opLambda) { + bool((must, should, mustNot, filter) -> { filteredLambda.callback(must, filter); }, opLambda); } @@ -98,7 +96,9 @@ public abstract class BsFavoriteLogCQ extends EsAbstractConditionQuery { FavoriteLogCQ filterQuery = new FavoriteLogCQ(); boolLambda.callback(mustQuery, shouldQuery, mustNotQuery, filterQuery); if (mustQuery.hasQueries() || shouldQuery.hasQueries() || mustNotQuery.hasQueries() || filterQuery.hasQueries()) { - BoolQueryBuilder builder = regBoolCQ(mustQuery.getQueryBuilderList(), shouldQuery.getQueryBuilderList(), mustNotQuery.getQueryBuilderList(), filterQuery.getQueryBuilderList()); + BoolQueryBuilder builder = + regBoolCQ(mustQuery.getQueryBuilderList(), shouldQuery.getQueryBuilderList(), mustNotQuery.getQueryBuilderList(), + filterQuery.getQueryBuilderList()); if (opLambda != null) { opLambda.callback(builder); } diff --git a/src/main/java/org/codelibs/fess/es/log/cbean/cq/bs/BsSearchFieldLogCQ.java b/src/main/java/org/codelibs/fess/es/log/cbean/cq/bs/BsSearchFieldLogCQ.java index 4fde2dd4c..bcadc017f 100644 --- a/src/main/java/org/codelibs/fess/es/log/cbean/cq/bs/BsSearchFieldLogCQ.java +++ b/src/main/java/org/codelibs/fess/es/log/cbean/cq/bs/BsSearchFieldLogCQ.java @@ -15,7 +15,7 @@ */ package org.codelibs.fess.es.log.cbean.cq.bs; -import java.time.*; +import java.time.LocalDateTime; import java.util.Collection; import org.codelibs.fess.es.log.allcommon.EsAbstractConditionQuery; @@ -33,7 +33,6 @@ import org.elasticsearch.index.query.RangeQueryBuilder; import org.elasticsearch.index.query.TermQueryBuilder; import org.elasticsearch.index.query.TermsQueryBuilder; - /** * @author ESFlute (using FreeGen) */ @@ -61,9 +60,8 @@ public abstract class BsSearchFieldLogCQ extends EsAbstractConditionQuery { filtered(filteredLambda, null); } - public void filtered(FilteredCall filteredLambda, - ConditionOptionCall opLambda) { - bool((must, should, mustNot, filter)->{ + public void filtered(FilteredCall filteredLambda, ConditionOptionCall opLambda) { + bool((must, should, mustNot, filter) -> { filteredLambda.callback(must, filter); }, opLambda); } @@ -98,7 +96,9 @@ public abstract class BsSearchFieldLogCQ extends EsAbstractConditionQuery { SearchFieldLogCQ filterQuery = new SearchFieldLogCQ(); boolLambda.callback(mustQuery, shouldQuery, mustNotQuery, filterQuery); if (mustQuery.hasQueries() || shouldQuery.hasQueries() || mustNotQuery.hasQueries() || filterQuery.hasQueries()) { - BoolQueryBuilder builder = regBoolCQ(mustQuery.getQueryBuilderList(), shouldQuery.getQueryBuilderList(), mustNotQuery.getQueryBuilderList(), filterQuery.getQueryBuilderList()); + BoolQueryBuilder builder = + regBoolCQ(mustQuery.getQueryBuilderList(), shouldQuery.getQueryBuilderList(), mustNotQuery.getQueryBuilderList(), + filterQuery.getQueryBuilderList()); if (opLambda != null) { opLambda.callback(builder); } diff --git a/src/main/java/org/codelibs/fess/es/log/cbean/cq/bs/BsSearchLogCQ.java b/src/main/java/org/codelibs/fess/es/log/cbean/cq/bs/BsSearchLogCQ.java index 7efdede8f..a65ae8fd5 100644 --- a/src/main/java/org/codelibs/fess/es/log/cbean/cq/bs/BsSearchLogCQ.java +++ b/src/main/java/org/codelibs/fess/es/log/cbean/cq/bs/BsSearchLogCQ.java @@ -15,7 +15,7 @@ */ package org.codelibs.fess.es.log.cbean.cq.bs; -import java.time.*; +import java.time.LocalDateTime; import java.util.Collection; import org.codelibs.fess.es.log.allcommon.EsAbstractConditionQuery; @@ -33,7 +33,6 @@ import org.elasticsearch.index.query.RangeQueryBuilder; import org.elasticsearch.index.query.TermQueryBuilder; import org.elasticsearch.index.query.TermsQueryBuilder; - /** * @author ESFlute (using FreeGen) */ @@ -61,9 +60,8 @@ public abstract class BsSearchLogCQ extends EsAbstractConditionQuery { filtered(filteredLambda, null); } - public void filtered(FilteredCall filteredLambda, - ConditionOptionCall opLambda) { - bool((must, should, mustNot, filter)->{ + public void filtered(FilteredCall filteredLambda, ConditionOptionCall opLambda) { + bool((must, should, mustNot, filter) -> { filteredLambda.callback(must, filter); }, opLambda); } @@ -98,7 +96,9 @@ public abstract class BsSearchLogCQ extends EsAbstractConditionQuery { SearchLogCQ filterQuery = new SearchLogCQ(); boolLambda.callback(mustQuery, shouldQuery, mustNotQuery, filterQuery); if (mustQuery.hasQueries() || shouldQuery.hasQueries() || mustNotQuery.hasQueries() || filterQuery.hasQueries()) { - BoolQueryBuilder builder = regBoolCQ(mustQuery.getQueryBuilderList(), shouldQuery.getQueryBuilderList(), mustNotQuery.getQueryBuilderList(), filterQuery.getQueryBuilderList()); + BoolQueryBuilder builder = + regBoolCQ(mustQuery.getQueryBuilderList(), shouldQuery.getQueryBuilderList(), mustNotQuery.getQueryBuilderList(), + filterQuery.getQueryBuilderList()); if (opLambda != null) { opLambda.callback(builder); } diff --git a/src/main/java/org/codelibs/fess/es/log/cbean/cq/bs/BsUserInfoCQ.java b/src/main/java/org/codelibs/fess/es/log/cbean/cq/bs/BsUserInfoCQ.java index 3f49f0a76..d57dc5591 100644 --- a/src/main/java/org/codelibs/fess/es/log/cbean/cq/bs/BsUserInfoCQ.java +++ b/src/main/java/org/codelibs/fess/es/log/cbean/cq/bs/BsUserInfoCQ.java @@ -15,7 +15,7 @@ */ package org.codelibs.fess.es.log.cbean.cq.bs; -import java.time.*; +import java.time.LocalDateTime; import java.util.Collection; import org.codelibs.fess.es.log.allcommon.EsAbstractConditionQuery; @@ -27,13 +27,11 @@ import org.elasticsearch.index.query.FuzzyQueryBuilder; import org.elasticsearch.index.query.IdsQueryBuilder; import org.elasticsearch.index.query.MatchQueryBuilder; import org.elasticsearch.index.query.NotQueryBuilder; -import org.elasticsearch.index.query.PrefixQueryBuilder; import org.elasticsearch.index.query.QueryBuilders; import org.elasticsearch.index.query.RangeQueryBuilder; import org.elasticsearch.index.query.TermQueryBuilder; import org.elasticsearch.index.query.TermsQueryBuilder; - /** * @author ESFlute (using FreeGen) */ @@ -61,9 +59,8 @@ public abstract class BsUserInfoCQ extends EsAbstractConditionQuery { filtered(filteredLambda, null); } - public void filtered(FilteredCall filteredLambda, - ConditionOptionCall opLambda) { - bool((must, should, mustNot, filter)->{ + public void filtered(FilteredCall filteredLambda, ConditionOptionCall opLambda) { + bool((must, should, mustNot, filter) -> { filteredLambda.callback(must, filter); }, opLambda); } @@ -98,7 +95,9 @@ public abstract class BsUserInfoCQ extends EsAbstractConditionQuery { UserInfoCQ filterQuery = new UserInfoCQ(); boolLambda.callback(mustQuery, shouldQuery, mustNotQuery, filterQuery); if (mustQuery.hasQueries() || shouldQuery.hasQueries() || mustNotQuery.hasQueries() || filterQuery.hasQueries()) { - BoolQueryBuilder builder = regBoolCQ(mustQuery.getQueryBuilderList(), shouldQuery.getQueryBuilderList(), mustNotQuery.getQueryBuilderList(), filterQuery.getQueryBuilderList()); + BoolQueryBuilder builder = + regBoolCQ(mustQuery.getQueryBuilderList(), shouldQuery.getQueryBuilderList(), mustNotQuery.getQueryBuilderList(), + filterQuery.getQueryBuilderList()); if (opLambda != null) { opLambda.callback(builder); } diff --git a/src/main/java/org/codelibs/fess/es/user/allcommon/EsAbstractBehavior.java b/src/main/java/org/codelibs/fess/es/user/allcommon/EsAbstractBehavior.java index ddb011927..8f73c9cfb 100644 --- a/src/main/java/org/codelibs/fess/es/user/allcommon/EsAbstractBehavior.java +++ b/src/main/java/org/codelibs/fess/es/user/allcommon/EsAbstractBehavior.java @@ -25,11 +25,8 @@ import java.util.function.Function; import javax.annotation.Resource; -import org.codelibs.fess.es.user.allcommon.EsAbstractEntity; import org.codelibs.fess.es.user.allcommon.EsAbstractEntity.DocMeta; import org.codelibs.fess.es.user.allcommon.EsAbstractEntity.RequestOptionCall; -import org.codelibs.fess.es.user.allcommon.EsAbstractConditionBean; -import org.codelibs.fess.es.user.allcommon.EsPagingResultBean; import org.dbflute.Entity; import org.dbflute.bhv.AbstractBehaviorWritable; import org.dbflute.bhv.readable.EntityRowHandler; @@ -74,8 +71,11 @@ public abstract class EsAbstractBehavior RESULT createEntity(Map source, Class entityType); // =================================================================================== @@ -192,8 +192,9 @@ public abstract class EsAbstractBehavior handler) { - final SearchRequestBuilder builder = client.prepareSearch(asEsIndex()).setTypes(asEsIndexType()).setSearchType(SearchType.SCAN) - .setScroll(scrollForCursor).setSize(sizeForCursor); + final SearchRequestBuilder builder = + client.prepareSearch(asEsIndex()).setTypes(asEsIndexType()).setSearchType(SearchType.SCAN).setScroll(scrollForCursor) + .setSize(sizeForCursor); ((EsAbstractConditionBean) cb).request().build(builder); final SearchResponse response = ((EsAbstractConditionBean) cb).build(builder).execute().actionGet(); @@ -301,8 +302,9 @@ public abstract class EsAbstractBehavior option) { - final SearchRequestBuilder builder = client.prepareSearch(asEsIndex()).setTypes(asEsIndexType()).setSearchType(SearchType.SCAN) - .setScroll(scrollForDelete).setSize(sizeForDelete); + final SearchRequestBuilder builder = + client.prepareSearch(asEsIndex()).setTypes(asEsIndexType()).setSearchType(SearchType.SCAN).setScroll(scrollForDelete) + .setSize(sizeForDelete); ((EsAbstractConditionBean) cb).request().build(builder); final SearchResponse response = ((EsAbstractConditionBean) cb).build(builder).execute().actionGet(); @@ -412,6 +414,7 @@ public abstract class EsAbstractBehavior mustList, List shouldList, List mustNotList, List filterList) { + protected BoolQueryBuilder regBoolCQ(List mustList, List shouldList, List mustNotList, + List filterList) { assertObjectNotNull("mustList", mustList); assertObjectNotNull("shouldList", shouldList); assertObjectNotNull("mustNotList", mustNotList); @@ -272,7 +273,6 @@ 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,4 +479,3 @@ public abstract class EsAbstractConditionQuery implements ConditionQuery { void callback(CQ and); } } - diff --git a/src/main/java/org/codelibs/fess/es/user/allcommon/EsAbstractEntity.java b/src/main/java/org/codelibs/fess/es/user/allcommon/EsAbstractEntity.java index b2bdab969..e99a20905 100644 --- a/src/main/java/org/codelibs/fess/es/user/allcommon/EsAbstractEntity.java +++ b/src/main/java/org/codelibs/fess/es/user/allcommon/EsAbstractEntity.java @@ -283,4 +283,3 @@ public abstract class EsAbstractEntity implements Entity, Serializable, Cloneabl void callback(OP op); } } - diff --git a/src/main/java/org/codelibs/fess/es/user/allcommon/EsPagingResultBean.java b/src/main/java/org/codelibs/fess/es/user/allcommon/EsPagingResultBean.java index dcddce262..2615f60e8 100644 --- a/src/main/java/org/codelibs/fess/es/user/allcommon/EsPagingResultBean.java +++ b/src/main/java/org/codelibs/fess/es/user/allcommon/EsPagingResultBean.java @@ -62,4 +62,3 @@ public class EsPagingResultBean extends PagingResultBean { this.failedShards = failedShards; } } - diff --git a/src/main/java/org/codelibs/fess/es/user/bsbhv/BsGroupBhv.java b/src/main/java/org/codelibs/fess/es/user/bsbhv/BsGroupBhv.java index 4ca1331ba..3d9237481 100644 --- a/src/main/java/org/codelibs/fess/es/user/bsbhv/BsGroupBhv.java +++ b/src/main/java/org/codelibs/fess/es/user/bsbhv/BsGroupBhv.java @@ -98,8 +98,7 @@ public abstract class BsGroupBhv extends EsAbstractBehavior { return doSelectOptionalEntity(cb, typeOfSelectedEntity()); } - protected OptionalEntity doSelectOptionalEntity(GroupCB cb, - Class tp) { + protected OptionalEntity doSelectOptionalEntity(GroupCB cb, Class tp) { return createOptionalEntity(doSelectEntity(cb, tp), cb); } @@ -167,7 +166,7 @@ public abstract class BsGroupBhv extends EsAbstractBehavior { } public void selectBulk(CBCall cbLambda, EntityRowHandler> entityLambda) { - delegateSelectBulk(createCB(cbLambda), entityLambda,typeOfSelectedEntity()); + delegateSelectBulk(createCB(cbLambda), entityLambda, typeOfSelectedEntity()); } // =================================================================================== @@ -229,8 +228,7 @@ public abstract class BsGroupBhv extends EsAbstractBehavior { return batchInsert(list, call, null); } - public int[] batchInsert(List list, RequestOptionCall call, - RequestOptionCall entityCall) { + public int[] batchInsert(List list, RequestOptionCall call, RequestOptionCall entityCall) { return doBatchInsert(new BulkList<>(list, call, entityCall), null); } @@ -242,8 +240,7 @@ public abstract class BsGroupBhv extends EsAbstractBehavior { return batchUpdate(list, call, null); } - public int[] batchUpdate(List list, RequestOptionCall call, - RequestOptionCall entityCall) { + public int[] batchUpdate(List list, RequestOptionCall call, RequestOptionCall entityCall) { return doBatchUpdate(new BulkList<>(list, call, entityCall), null); } @@ -255,11 +252,9 @@ public abstract class BsGroupBhv extends EsAbstractBehavior { return batchDelete(list, call, null); } - public int[] batchDelete(List list, RequestOptionCall call, - RequestOptionCall entityCall) { + public int[] batchDelete(List list, RequestOptionCall call, RequestOptionCall entityCall) { return doBatchDelete(new BulkList<>(list, call, entityCall), null); } // #pending create, modify, remove } - diff --git a/src/main/java/org/codelibs/fess/es/user/bsbhv/BsRoleBhv.java b/src/main/java/org/codelibs/fess/es/user/bsbhv/BsRoleBhv.java index 3fba36972..2fe284514 100644 --- a/src/main/java/org/codelibs/fess/es/user/bsbhv/BsRoleBhv.java +++ b/src/main/java/org/codelibs/fess/es/user/bsbhv/BsRoleBhv.java @@ -97,8 +97,7 @@ public abstract class BsRoleBhv extends EsAbstractBehavior { return doSelectOptionalEntity(cb, typeOfSelectedEntity()); } - protected OptionalEntity doSelectOptionalEntity(RoleCB cb, - Class tp) { + protected OptionalEntity doSelectOptionalEntity(RoleCB cb, Class tp) { return createOptionalEntity(doSelectEntity(cb, tp), cb); } @@ -166,7 +165,7 @@ public abstract class BsRoleBhv extends EsAbstractBehavior { } public void selectBulk(CBCall cbLambda, EntityRowHandler> entityLambda) { - delegateSelectBulk(createCB(cbLambda), entityLambda,typeOfSelectedEntity()); + delegateSelectBulk(createCB(cbLambda), entityLambda, typeOfSelectedEntity()); } // =================================================================================== @@ -228,8 +227,7 @@ public abstract class BsRoleBhv extends EsAbstractBehavior { return batchInsert(list, call, null); } - public int[] batchInsert(List list, RequestOptionCall call, - RequestOptionCall entityCall) { + public int[] batchInsert(List list, RequestOptionCall call, RequestOptionCall entityCall) { return doBatchInsert(new BulkList<>(list, call, entityCall), null); } @@ -241,8 +239,7 @@ public abstract class BsRoleBhv extends EsAbstractBehavior { return batchUpdate(list, call, null); } - public int[] batchUpdate(List list, RequestOptionCall call, - RequestOptionCall entityCall) { + public int[] batchUpdate(List list, RequestOptionCall call, RequestOptionCall entityCall) { return doBatchUpdate(new BulkList<>(list, call, entityCall), null); } @@ -254,11 +251,9 @@ public abstract class BsRoleBhv extends EsAbstractBehavior { return batchDelete(list, call, null); } - public int[] batchDelete(List list, RequestOptionCall call, - RequestOptionCall entityCall) { + public int[] batchDelete(List list, RequestOptionCall call, RequestOptionCall entityCall) { return doBatchDelete(new BulkList<>(list, call, entityCall), null); } // #pending create, modify, remove } - diff --git a/src/main/java/org/codelibs/fess/es/user/bsbhv/BsUserBhv.java b/src/main/java/org/codelibs/fess/es/user/bsbhv/BsUserBhv.java index 691ac0d8a..161e29da7 100644 --- a/src/main/java/org/codelibs/fess/es/user/bsbhv/BsUserBhv.java +++ b/src/main/java/org/codelibs/fess/es/user/bsbhv/BsUserBhv.java @@ -136,8 +136,7 @@ public abstract class BsUserBhv extends EsAbstractBehavior { return doSelectOptionalEntity(cb, typeOfSelectedEntity()); } - protected OptionalEntity doSelectOptionalEntity(UserCB cb, - Class tp) { + protected OptionalEntity doSelectOptionalEntity(UserCB cb, Class tp) { return createOptionalEntity(doSelectEntity(cb, tp), cb); } @@ -205,7 +204,7 @@ public abstract class BsUserBhv extends EsAbstractBehavior { } public void selectBulk(CBCall cbLambda, EntityRowHandler> entityLambda) { - delegateSelectBulk(createCB(cbLambda), entityLambda,typeOfSelectedEntity()); + delegateSelectBulk(createCB(cbLambda), entityLambda, typeOfSelectedEntity()); } // =================================================================================== @@ -267,8 +266,7 @@ public abstract class BsUserBhv extends EsAbstractBehavior { return batchInsert(list, call, null); } - public int[] batchInsert(List list, RequestOptionCall call, - RequestOptionCall entityCall) { + public int[] batchInsert(List list, RequestOptionCall call, RequestOptionCall entityCall) { return doBatchInsert(new BulkList<>(list, call, entityCall), null); } @@ -280,8 +278,7 @@ public abstract class BsUserBhv extends EsAbstractBehavior { return batchUpdate(list, call, null); } - public int[] batchUpdate(List list, RequestOptionCall call, - RequestOptionCall entityCall) { + public int[] batchUpdate(List list, RequestOptionCall call, RequestOptionCall entityCall) { return doBatchUpdate(new BulkList<>(list, call, entityCall), null); } @@ -293,11 +290,9 @@ public abstract class BsUserBhv extends EsAbstractBehavior { return batchDelete(list, call, null); } - public int[] batchDelete(List list, RequestOptionCall call, - RequestOptionCall entityCall) { + public int[] batchDelete(List list, RequestOptionCall call, RequestOptionCall entityCall) { return doBatchDelete(new BulkList<>(list, call, entityCall), null); } // #pending create, modify, remove } - diff --git a/src/main/java/org/codelibs/fess/es/user/bsentity/BsGroup.java b/src/main/java/org/codelibs/fess/es/user/bsentity/BsGroup.java index aac40c4a1..1938c1039 100644 --- a/src/main/java/org/codelibs/fess/es/user/bsentity/BsGroup.java +++ b/src/main/java/org/codelibs/fess/es/user/bsentity/BsGroup.java @@ -15,7 +15,7 @@ */ package org.codelibs.fess.es.user.bsentity; -import java.time.*; +import java.time.LocalDateTime; import java.util.HashMap; import java.util.Map; diff --git a/src/main/java/org/codelibs/fess/es/user/bsentity/BsRole.java b/src/main/java/org/codelibs/fess/es/user/bsentity/BsRole.java index 7bf062161..3f6531b8d 100644 --- a/src/main/java/org/codelibs/fess/es/user/bsentity/BsRole.java +++ b/src/main/java/org/codelibs/fess/es/user/bsentity/BsRole.java @@ -15,7 +15,7 @@ */ package org.codelibs.fess.es.user.bsentity; -import java.time.*; +import java.time.LocalDateTime; import java.util.HashMap; import java.util.Map; diff --git a/src/main/java/org/codelibs/fess/es/user/bsentity/BsUser.java b/src/main/java/org/codelibs/fess/es/user/bsentity/BsUser.java index 247a16573..b3efff87a 100644 --- a/src/main/java/org/codelibs/fess/es/user/bsentity/BsUser.java +++ b/src/main/java/org/codelibs/fess/es/user/bsentity/BsUser.java @@ -15,7 +15,7 @@ */ package org.codelibs.fess.es.user.bsentity; -import java.time.*; +import java.time.LocalDateTime; import java.util.HashMap; import java.util.Map; diff --git a/src/main/java/org/codelibs/fess/es/user/bsentity/dbmeta/GroupDbm.java b/src/main/java/org/codelibs/fess/es/user/bsentity/dbmeta/GroupDbm.java index d478cc1d4..ee513bffa 100644 --- a/src/main/java/org/codelibs/fess/es/user/bsentity/dbmeta/GroupDbm.java +++ b/src/main/java/org/codelibs/fess/es/user/bsentity/dbmeta/GroupDbm.java @@ -15,12 +15,11 @@ */ package org.codelibs.fess.es.user.bsentity.dbmeta; -import java.time.*; +import java.time.LocalDateTime; import java.util.List; import java.util.Map; import org.codelibs.fess.es.user.exentity.Group; - import org.dbflute.Entity; import org.dbflute.dbmeta.AbstractDBMeta; import org.dbflute.dbmeta.info.ColumnInfo; @@ -80,8 +79,8 @@ public class GroupDbm extends AbstractDBMeta { // --------------- protected final Map _epgMap = newHashMap(); { - setupEpg(_epgMap, et-> ((Group)et).getName(),(et,vl)->((Group) et).setName(DfTypeUtil.toString(vl)), "name"); - setupEpg(_epgMap, et-> ((Group)et).getGidNumber(),(et,vl)->((Group) et).setGidNumber(DfTypeUtil.toLong(vl)), "gidNumber"); + setupEpg(_epgMap, et -> ((Group) et).getName(), (et, vl) -> ((Group) et).setName(DfTypeUtil.toString(vl)), "name"); + setupEpg(_epgMap, et -> ((Group) et).getGidNumber(), (et, vl) -> ((Group) et).setGidNumber(DfTypeUtil.toLong(vl)), "gidNumber"); } @Override @@ -95,22 +94,41 @@ public class GroupDbm extends AbstractDBMeta { protected final String _tableDbName = "group"; protected final String _tableDispName = "group"; protected final String _tablePropertyName = "Group"; - public String getTableDbName() { return _tableDbName; } + + public String getTableDbName() { + return _tableDbName; + } + @Override - public String getTableDispName() { return _tableDispName; } + public String getTableDispName() { + return _tableDispName; + } + @Override - public String getTablePropertyName() { return _tablePropertyName; } + public String getTablePropertyName() { + return _tablePropertyName; + } + @Override - public TableSqlName getTableSqlName() { return null; } + public TableSqlName getTableSqlName() { + return null; + } // =================================================================================== // Column Info // =========== - protected final ColumnInfo _columnName = cci("name", "name", null, null, String.class, "name", null, false, false, false, "String", 0, 0, null, false, null, null, null, null, null, false); - protected final ColumnInfo _columnGidNumber = cci("gidNumber", "gidNumber", null, null, Long.class, "gidNumber", 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 _columnGidNumber = cci("gidNumber", "gidNumber", null, null, Long.class, "gidNumber", null, false, false, + false, "Long", 0, 0, null, false, null, null, null, null, null, false); - public ColumnInfo columnName() { return _columnName; } - public ColumnInfo columnGidNumber() { return _columnGidNumber; } + public ColumnInfo columnName() { + return _columnName; + } + + public ColumnInfo columnGidNumber() { + return _columnGidNumber; + } protected List ccil() { List ls = newArrayList(); @@ -192,4 +210,3 @@ public class GroupDbm extends AbstractDBMeta { return null; } } - diff --git a/src/main/java/org/codelibs/fess/es/user/bsentity/dbmeta/RoleDbm.java b/src/main/java/org/codelibs/fess/es/user/bsentity/dbmeta/RoleDbm.java index 576f64b7d..fef2f24b9 100644 --- a/src/main/java/org/codelibs/fess/es/user/bsentity/dbmeta/RoleDbm.java +++ b/src/main/java/org/codelibs/fess/es/user/bsentity/dbmeta/RoleDbm.java @@ -15,12 +15,11 @@ */ package org.codelibs.fess.es.user.bsentity.dbmeta; -import java.time.*; +import java.time.LocalDateTime; import java.util.List; import java.util.Map; import org.codelibs.fess.es.user.exentity.Role; - import org.dbflute.Entity; import org.dbflute.dbmeta.AbstractDBMeta; import org.dbflute.dbmeta.info.ColumnInfo; @@ -80,7 +79,7 @@ public class RoleDbm extends AbstractDBMeta { // --------------- protected final Map _epgMap = newHashMap(); { - setupEpg(_epgMap, et-> ((Role)et).getName(),(et,vl)->((Role) et).setName(DfTypeUtil.toString(vl)), "name"); + setupEpg(_epgMap, et -> ((Role) et).getName(), (et, vl) -> ((Role) et).setName(DfTypeUtil.toString(vl)), "name"); } @Override @@ -94,20 +93,35 @@ public class RoleDbm extends AbstractDBMeta { protected final String _tableDbName = "role"; protected final String _tableDispName = "role"; protected final String _tablePropertyName = "Role"; - public String getTableDbName() { return _tableDbName; } + + public String getTableDbName() { + return _tableDbName; + } + @Override - public String getTableDispName() { return _tableDispName; } + public String getTableDispName() { + return _tableDispName; + } + @Override - public String getTablePropertyName() { return _tablePropertyName; } + public String getTablePropertyName() { + return _tablePropertyName; + } + @Override - public TableSqlName getTableSqlName() { return null; } + public TableSqlName getTableSqlName() { + return null; + } // =================================================================================== // Column Info // =========== - protected final ColumnInfo _columnName = cci("name", "name", null, null, String.class, "name", null, false, false, false, "String", 0, 0, null, false, null, null, null, null, null, false); + protected final ColumnInfo _columnName = cci("name", "name", null, null, String.class, "name", null, false, false, false, "String", 0, + 0, null, false, null, null, null, null, null, false); - public ColumnInfo columnName() { return _columnName; } + public ColumnInfo columnName() { + return _columnName; + } protected List ccil() { List ls = newArrayList(); @@ -188,4 +202,3 @@ public class RoleDbm extends AbstractDBMeta { return null; } } - diff --git a/src/main/java/org/codelibs/fess/es/user/bsentity/dbmeta/UserDbm.java b/src/main/java/org/codelibs/fess/es/user/bsentity/dbmeta/UserDbm.java index 140638116..ab74db479 100644 --- a/src/main/java/org/codelibs/fess/es/user/bsentity/dbmeta/UserDbm.java +++ b/src/main/java/org/codelibs/fess/es/user/bsentity/dbmeta/UserDbm.java @@ -15,12 +15,11 @@ */ package org.codelibs.fess.es.user.bsentity.dbmeta; -import java.time.*; +import java.time.LocalDateTime; import java.util.List; import java.util.Map; import org.codelibs.fess.es.user.exentity.User; - import org.dbflute.Entity; import org.dbflute.dbmeta.AbstractDBMeta; import org.dbflute.dbmeta.info.ColumnInfo; @@ -80,46 +79,65 @@ public class UserDbm extends AbstractDBMeta { // --------------- protected final Map _epgMap = newHashMap(); { - setupEpg(_epgMap, et-> ((User)et).getName(),(et,vl)->((User) et).setName(DfTypeUtil.toString(vl)), "name"); - setupEpg(_epgMap, et-> ((User)et).getPassword(),(et,vl)->((User) et).setPassword(DfTypeUtil.toString(vl)), "password"); - setupEpg(_epgMap, et-> ((User)et).getSurname(),(et,vl)->((User) et).setSurname(DfTypeUtil.toString(vl)), "surname"); - setupEpg(_epgMap, et-> ((User)et).getGivenName(),(et,vl)->((User) et).setGivenName(DfTypeUtil.toString(vl)), "givenName"); - setupEpg(_epgMap, et-> ((User)et).getEmployeeNumber(),(et,vl)->((User) et).setEmployeeNumber(DfTypeUtil.toString(vl)), "employeeNumber"); - setupEpg(_epgMap, et-> ((User)et).getMail(),(et,vl)->((User) et).setMail(DfTypeUtil.toString(vl)), "mail"); - setupEpg(_epgMap, et-> ((User)et).getTelephoneNumber(),(et,vl)->((User) et).setTelephoneNumber(DfTypeUtil.toString(vl)), "telephoneNumber"); - setupEpg(_epgMap, et-> ((User)et).getHomePhone(),(et,vl)->((User) et).setHomePhone(DfTypeUtil.toString(vl)), "homePhone"); - setupEpg(_epgMap, et-> ((User)et).getHomePostalAddress(),(et,vl)->((User) et).setHomePostalAddress(DfTypeUtil.toString(vl)), "homePostalAddress"); - setupEpg(_epgMap, et-> ((User)et).getLabeledURI(),(et,vl)->((User) et).setLabeledURI(DfTypeUtil.toString(vl)), "labeledURI"); - setupEpg(_epgMap, et-> ((User)et).getRoomNumber(),(et,vl)->((User) et).setRoomNumber(DfTypeUtil.toString(vl)), "roomNumber"); - setupEpg(_epgMap, et-> ((User)et).getDescription(),(et,vl)->((User) et).setDescription(DfTypeUtil.toString(vl)), "description"); - setupEpg(_epgMap, et-> ((User)et).getTitle(),(et,vl)->((User) et).setTitle(DfTypeUtil.toString(vl)), "title"); - setupEpg(_epgMap, et-> ((User)et).getPager(),(et,vl)->((User) et).setPager(DfTypeUtil.toString(vl)), "pager"); - setupEpg(_epgMap, et-> ((User)et).getStreet(),(et,vl)->((User) et).setStreet(DfTypeUtil.toString(vl)), "street"); - setupEpg(_epgMap, et-> ((User)et).getPostalCode(),(et,vl)->((User) et).setPostalCode(DfTypeUtil.toString(vl)), "postalCode"); - setupEpg(_epgMap, et-> ((User)et).getPhysicalDeliveryOfficeName(),(et,vl)->((User) et).setPhysicalDeliveryOfficeName(DfTypeUtil.toString(vl)), "physicalDeliveryOfficeName"); - setupEpg(_epgMap, et-> ((User)et).getDestinationIndicator(),(et,vl)->((User) et).setDestinationIndicator(DfTypeUtil.toString(vl)), "destinationIndicator"); - setupEpg(_epgMap, et-> ((User)et).getInternationaliSDNNumber(),(et,vl)->((User) et).setInternationaliSDNNumber(DfTypeUtil.toString(vl)), "internationaliSDNNumber"); - setupEpg(_epgMap, et-> ((User)et).getState(),(et,vl)->((User) et).setState(DfTypeUtil.toString(vl)), "state"); - setupEpg(_epgMap, et-> ((User)et).getEmployeeType(),(et,vl)->((User) et).setEmployeeType(DfTypeUtil.toString(vl)), "employeeType"); - setupEpg(_epgMap, et-> ((User)et).getFacsimileTelephoneNumber(),(et,vl)->((User) et).setFacsimileTelephoneNumber(DfTypeUtil.toString(vl)), "facsimileTelephoneNumber"); - setupEpg(_epgMap, et-> ((User)et).getPostOfficeBox(),(et,vl)->((User) et).setPostOfficeBox(DfTypeUtil.toString(vl)), "postOfficeBox"); - setupEpg(_epgMap, et-> ((User)et).getInitials(),(et,vl)->((User) et).setInitials(DfTypeUtil.toString(vl)), "initials"); - setupEpg(_epgMap, et-> ((User)et).getCarLicense(),(et,vl)->((User) et).setCarLicense(DfTypeUtil.toString(vl)), "carLicense"); - setupEpg(_epgMap, et-> ((User)et).getMobile(),(et,vl)->((User) et).setMobile(DfTypeUtil.toString(vl)), "mobile"); - setupEpg(_epgMap, et-> ((User)et).getPostalAddress(),(et,vl)->((User) et).setPostalAddress(DfTypeUtil.toString(vl)), "postalAddress"); - setupEpg(_epgMap, et-> ((User)et).getCity(),(et,vl)->((User) et).setCity(DfTypeUtil.toString(vl)), "city"); - setupEpg(_epgMap, et-> ((User)et).getTeletexTerminalIdentifier(),(et,vl)->((User) et).setTeletexTerminalIdentifier(DfTypeUtil.toString(vl)), "teletexTerminalIdentifier"); - setupEpg(_epgMap, et-> ((User)et).getX121Address(),(et,vl)->((User) et).setX121Address(DfTypeUtil.toString(vl)), "x121Address"); - setupEpg(_epgMap, et-> ((User)et).getBusinessCategory(),(et,vl)->((User) et).setBusinessCategory(DfTypeUtil.toString(vl)), "businessCategory"); - setupEpg(_epgMap, et-> ((User)et).getRegisteredAddress(),(et,vl)->((User) et).setRegisteredAddress(DfTypeUtil.toString(vl)), "registeredAddress"); - setupEpg(_epgMap, et-> ((User)et).getDisplayName(),(et,vl)->((User) et).setDisplayName(DfTypeUtil.toString(vl)), "displayName"); - setupEpg(_epgMap, et-> ((User)et).getPreferredLanguage(),(et,vl)->((User) et).setPreferredLanguage(DfTypeUtil.toString(vl)), "preferredLanguage"); - setupEpg(_epgMap, et-> ((User)et).getDepartmentNumber(),(et,vl)->((User) et).setDepartmentNumber(DfTypeUtil.toString(vl)), "departmentNumber"); - setupEpg(_epgMap, et-> ((User)et).getUidNumber(),(et,vl)->((User) et).setUidNumber(DfTypeUtil.toLong(vl)), "uidNumber"); - setupEpg(_epgMap, et-> ((User)et).getGidNumber(),(et,vl)->((User) et).setGidNumber(DfTypeUtil.toLong(vl)), "gidNumber"); - setupEpg(_epgMap, et-> ((User)et).getHomeDirectory(),(et,vl)->((User) et).setHomeDirectory(DfTypeUtil.toString(vl)), "homeDirectory"); - setupEpg(_epgMap, et-> ((User)et).getGroups(),(et,vl)->((User) et).setGroups((String[])vl), "groups"); - setupEpg(_epgMap, et-> ((User)et).getRoles(),(et,vl)->((User) et).setRoles((String[])vl), "roles"); + setupEpg(_epgMap, et -> ((User) et).getName(), (et, vl) -> ((User) et).setName(DfTypeUtil.toString(vl)), "name"); + setupEpg(_epgMap, et -> ((User) et).getPassword(), (et, vl) -> ((User) et).setPassword(DfTypeUtil.toString(vl)), "password"); + setupEpg(_epgMap, et -> ((User) et).getSurname(), (et, vl) -> ((User) et).setSurname(DfTypeUtil.toString(vl)), "surname"); + setupEpg(_epgMap, et -> ((User) et).getGivenName(), (et, vl) -> ((User) et).setGivenName(DfTypeUtil.toString(vl)), "givenName"); + setupEpg(_epgMap, et -> ((User) et).getEmployeeNumber(), (et, vl) -> ((User) et).setEmployeeNumber(DfTypeUtil.toString(vl)), + "employeeNumber"); + setupEpg(_epgMap, et -> ((User) et).getMail(), (et, vl) -> ((User) et).setMail(DfTypeUtil.toString(vl)), "mail"); + setupEpg(_epgMap, et -> ((User) et).getTelephoneNumber(), (et, vl) -> ((User) et).setTelephoneNumber(DfTypeUtil.toString(vl)), + "telephoneNumber"); + setupEpg(_epgMap, et -> ((User) et).getHomePhone(), (et, vl) -> ((User) et).setHomePhone(DfTypeUtil.toString(vl)), "homePhone"); + setupEpg(_epgMap, et -> ((User) et).getHomePostalAddress(), (et, vl) -> ((User) et).setHomePostalAddress(DfTypeUtil.toString(vl)), + "homePostalAddress"); + setupEpg(_epgMap, et -> ((User) et).getLabeledURI(), (et, vl) -> ((User) et).setLabeledURI(DfTypeUtil.toString(vl)), "labeledURI"); + setupEpg(_epgMap, et -> ((User) et).getRoomNumber(), (et, vl) -> ((User) et).setRoomNumber(DfTypeUtil.toString(vl)), "roomNumber"); + setupEpg(_epgMap, et -> ((User) et).getDescription(), (et, vl) -> ((User) et).setDescription(DfTypeUtil.toString(vl)), + "description"); + setupEpg(_epgMap, et -> ((User) et).getTitle(), (et, vl) -> ((User) et).setTitle(DfTypeUtil.toString(vl)), "title"); + setupEpg(_epgMap, et -> ((User) et).getPager(), (et, vl) -> ((User) et).setPager(DfTypeUtil.toString(vl)), "pager"); + setupEpg(_epgMap, et -> ((User) et).getStreet(), (et, vl) -> ((User) et).setStreet(DfTypeUtil.toString(vl)), "street"); + setupEpg(_epgMap, et -> ((User) et).getPostalCode(), (et, vl) -> ((User) et).setPostalCode(DfTypeUtil.toString(vl)), "postalCode"); + setupEpg(_epgMap, et -> ((User) et).getPhysicalDeliveryOfficeName(), + (et, vl) -> ((User) et).setPhysicalDeliveryOfficeName(DfTypeUtil.toString(vl)), "physicalDeliveryOfficeName"); + setupEpg(_epgMap, et -> ((User) et).getDestinationIndicator(), + (et, vl) -> ((User) et).setDestinationIndicator(DfTypeUtil.toString(vl)), "destinationIndicator"); + setupEpg(_epgMap, et -> ((User) et).getInternationaliSDNNumber(), + (et, vl) -> ((User) et).setInternationaliSDNNumber(DfTypeUtil.toString(vl)), "internationaliSDNNumber"); + setupEpg(_epgMap, et -> ((User) et).getState(), (et, vl) -> ((User) et).setState(DfTypeUtil.toString(vl)), "state"); + setupEpg(_epgMap, et -> ((User) et).getEmployeeType(), (et, vl) -> ((User) et).setEmployeeType(DfTypeUtil.toString(vl)), + "employeeType"); + setupEpg(_epgMap, et -> ((User) et).getFacsimileTelephoneNumber(), + (et, vl) -> ((User) et).setFacsimileTelephoneNumber(DfTypeUtil.toString(vl)), "facsimileTelephoneNumber"); + setupEpg(_epgMap, et -> ((User) et).getPostOfficeBox(), (et, vl) -> ((User) et).setPostOfficeBox(DfTypeUtil.toString(vl)), + "postOfficeBox"); + setupEpg(_epgMap, et -> ((User) et).getInitials(), (et, vl) -> ((User) et).setInitials(DfTypeUtil.toString(vl)), "initials"); + setupEpg(_epgMap, et -> ((User) et).getCarLicense(), (et, vl) -> ((User) et).setCarLicense(DfTypeUtil.toString(vl)), "carLicense"); + setupEpg(_epgMap, et -> ((User) et).getMobile(), (et, vl) -> ((User) et).setMobile(DfTypeUtil.toString(vl)), "mobile"); + setupEpg(_epgMap, et -> ((User) et).getPostalAddress(), (et, vl) -> ((User) et).setPostalAddress(DfTypeUtil.toString(vl)), + "postalAddress"); + setupEpg(_epgMap, et -> ((User) et).getCity(), (et, vl) -> ((User) et).setCity(DfTypeUtil.toString(vl)), "city"); + setupEpg(_epgMap, et -> ((User) et).getTeletexTerminalIdentifier(), + (et, vl) -> ((User) et).setTeletexTerminalIdentifier(DfTypeUtil.toString(vl)), "teletexTerminalIdentifier"); + setupEpg(_epgMap, et -> ((User) et).getX121Address(), (et, vl) -> ((User) et).setX121Address(DfTypeUtil.toString(vl)), + "x121Address"); + setupEpg(_epgMap, et -> ((User) et).getBusinessCategory(), (et, vl) -> ((User) et).setBusinessCategory(DfTypeUtil.toString(vl)), + "businessCategory"); + setupEpg(_epgMap, et -> ((User) et).getRegisteredAddress(), (et, vl) -> ((User) et).setRegisteredAddress(DfTypeUtil.toString(vl)), + "registeredAddress"); + setupEpg(_epgMap, et -> ((User) et).getDisplayName(), (et, vl) -> ((User) et).setDisplayName(DfTypeUtil.toString(vl)), + "displayName"); + setupEpg(_epgMap, et -> ((User) et).getPreferredLanguage(), (et, vl) -> ((User) et).setPreferredLanguage(DfTypeUtil.toString(vl)), + "preferredLanguage"); + setupEpg(_epgMap, et -> ((User) et).getDepartmentNumber(), (et, vl) -> ((User) et).setDepartmentNumber(DfTypeUtil.toString(vl)), + "departmentNumber"); + setupEpg(_epgMap, et -> ((User) et).getUidNumber(), (et, vl) -> ((User) et).setUidNumber(DfTypeUtil.toLong(vl)), "uidNumber"); + setupEpg(_epgMap, et -> ((User) et).getGidNumber(), (et, vl) -> ((User) et).setGidNumber(DfTypeUtil.toLong(vl)), "gidNumber"); + setupEpg(_epgMap, et -> ((User) et).getHomeDirectory(), (et, vl) -> ((User) et).setHomeDirectory(DfTypeUtil.toString(vl)), + "homeDirectory"); + setupEpg(_epgMap, et -> ((User) et).getGroups(), (et, vl) -> ((User) et).setGroups((String[]) vl), "groups"); + setupEpg(_epgMap, et -> ((User) et).getRoles(), (et, vl) -> ((User) et).setRoles((String[]) vl), "roles"); } @Override @@ -133,98 +151,273 @@ public class UserDbm extends AbstractDBMeta { protected final String _tableDbName = "user"; protected final String _tableDispName = "user"; protected final String _tablePropertyName = "User"; - public String getTableDbName() { return _tableDbName; } + + public String getTableDbName() { + return _tableDbName; + } + @Override - public String getTableDispName() { return _tableDispName; } + public String getTableDispName() { + return _tableDispName; + } + @Override - public String getTablePropertyName() { return _tablePropertyName; } + public String getTablePropertyName() { + return _tablePropertyName; + } + @Override - public TableSqlName getTableSqlName() { return null; } + public TableSqlName getTableSqlName() { + return null; + } // =================================================================================== // Column Info // =========== - protected final ColumnInfo _columnName = cci("name", "name", null, null, String.class, "name", null, false, false, false, "String", 0, 0, null, false, null, null, null, null, null, false); - protected final ColumnInfo _columnPassword = cci("password", "password", null, null, String.class, "password", null, false, false, false, "String", 0, 0, null, false, null, null, null, null, null, false); - protected final ColumnInfo _columnSurname = cci("surname", "surname", null, null, String.class, "surname", null, false, false, false, "String", 0, 0, null, false, null, null, null, null, null, false); - protected final ColumnInfo _columnGivenName = cci("givenName", "givenName", null, null, String.class, "givenName", null, false, false, false, "String", 0, 0, null, false, null, null, null, null, null, false); - protected final ColumnInfo _columnEmployeeNumber = cci("employeeNumber", "employeeNumber", null, null, String.class, "employeeNumber", null, false, false, false, "String", 0, 0, null, false, null, null, null, null, null, false); - protected final ColumnInfo _columnMail = cci("mail", "mail", null, null, String.class, "mail", null, false, false, false, "String", 0, 0, null, false, null, null, null, null, null, false); - protected final ColumnInfo _columnTelephoneNumber = cci("telephoneNumber", "telephoneNumber", null, null, String.class, "telephoneNumber", null, false, false, false, "String", 0, 0, null, false, null, null, null, null, null, false); - protected final ColumnInfo _columnHomePhone = cci("homePhone", "homePhone", null, null, String.class, "homePhone", null, false, false, false, "String", 0, 0, null, false, null, null, null, null, null, false); - protected final ColumnInfo _columnHomePostalAddress = cci("homePostalAddress", "homePostalAddress", null, null, String.class, "homePostalAddress", null, false, false, false, "String", 0, 0, null, false, null, null, null, null, null, false); - protected final ColumnInfo _columnLabeledURI = cci("labeledURI", "labeledURI", null, null, String.class, "labeledURI", null, false, false, false, "String", 0, 0, null, false, null, null, null, null, null, false); - protected final ColumnInfo _columnRoomNumber = cci("roomNumber", "roomNumber", null, null, String.class, "roomNumber", null, false, false, false, "String", 0, 0, null, false, null, null, null, null, null, false); - protected final ColumnInfo _columnDescription = cci("description", "description", null, null, String.class, "description", null, false, false, false, "String", 0, 0, null, false, null, null, null, null, null, false); - protected final ColumnInfo _columnTitle = cci("title", "title", null, null, String.class, "title", null, false, false, false, "String", 0, 0, null, false, null, null, null, null, null, false); - protected final ColumnInfo _columnPager = cci("pager", "pager", null, null, String.class, "pager", null, false, false, false, "String", 0, 0, null, false, null, null, null, null, null, false); - protected final ColumnInfo _columnStreet = cci("street", "street", null, null, String.class, "street", null, false, false, false, "String", 0, 0, null, false, null, null, null, null, null, false); - protected final ColumnInfo _columnPostalCode = cci("postalCode", "postalCode", null, null, String.class, "postalCode", null, false, false, false, "String", 0, 0, null, false, null, null, null, null, null, false); - protected final ColumnInfo _columnPhysicalDeliveryOfficeName = cci("physicalDeliveryOfficeName", "physicalDeliveryOfficeName", null, null, String.class, "physicalDeliveryOfficeName", null, false, false, false, "String", 0, 0, null, false, null, null, null, null, null, false); - protected final ColumnInfo _columnDestinationIndicator = cci("destinationIndicator", "destinationIndicator", null, null, String.class, "destinationIndicator", null, false, false, false, "String", 0, 0, null, false, null, null, null, null, null, false); - protected final ColumnInfo _columnInternationaliSDNNumber = cci("internationaliSDNNumber", "internationaliSDNNumber", null, null, String.class, "internationaliSDNNumber", null, false, false, false, "String", 0, 0, null, false, null, null, null, null, null, false); - protected final ColumnInfo _columnState = cci("state", "state", null, null, String.class, "state", null, false, false, false, "String", 0, 0, null, false, null, null, null, null, null, false); - protected final ColumnInfo _columnEmployeeType = cci("employeeType", "employeeType", null, null, String.class, "employeeType", null, false, false, false, "String", 0, 0, null, false, null, null, null, null, null, false); - protected final ColumnInfo _columnFacsimileTelephoneNumber = cci("facsimileTelephoneNumber", "facsimileTelephoneNumber", null, null, String.class, "facsimileTelephoneNumber", null, false, false, false, "String", 0, 0, null, false, null, null, null, null, null, false); - protected final ColumnInfo _columnPostOfficeBox = cci("postOfficeBox", "postOfficeBox", null, null, String.class, "postOfficeBox", null, false, false, false, "String", 0, 0, null, false, null, null, null, null, null, false); - protected final ColumnInfo _columnInitials = cci("initials", "initials", null, null, String.class, "initials", null, false, false, false, "String", 0, 0, null, false, null, null, null, null, null, false); - protected final ColumnInfo _columnCarLicense = cci("carLicense", "carLicense", null, null, String.class, "carLicense", null, false, false, false, "String", 0, 0, null, false, null, null, null, null, null, false); - protected final ColumnInfo _columnMobile = cci("mobile", "mobile", null, null, String.class, "mobile", null, false, false, false, "String", 0, 0, null, false, null, null, null, null, null, false); - protected final ColumnInfo _columnPostalAddress = cci("postalAddress", "postalAddress", null, null, String.class, "postalAddress", null, false, false, false, "String", 0, 0, null, false, null, null, null, null, null, false); - protected final ColumnInfo _columnCity = cci("city", "city", null, null, String.class, "city", null, false, false, false, "String", 0, 0, null, false, null, null, null, null, null, false); - protected final ColumnInfo _columnTeletexTerminalIdentifier = cci("teletexTerminalIdentifier", "teletexTerminalIdentifier", null, null, String.class, "teletexTerminalIdentifier", null, false, false, false, "String", 0, 0, null, false, null, null, null, null, null, false); - protected final ColumnInfo _columnX121Address = cci("x121Address", "x121Address", null, null, String.class, "x121Address", null, false, false, false, "String", 0, 0, null, false, null, null, null, null, null, false); - protected final ColumnInfo _columnBusinessCategory = cci("businessCategory", "businessCategory", null, null, String.class, "businessCategory", null, false, false, false, "String", 0, 0, null, false, null, null, null, null, null, false); - protected final ColumnInfo _columnRegisteredAddress = cci("registeredAddress", "registeredAddress", null, null, String.class, "registeredAddress", null, false, false, false, "String", 0, 0, null, false, null, null, null, null, null, false); - protected final ColumnInfo _columnDisplayName = cci("displayName", "displayName", null, null, String.class, "displayName", null, false, false, false, "String", 0, 0, null, false, null, null, null, null, null, false); - protected final ColumnInfo _columnPreferredLanguage = cci("preferredLanguage", "preferredLanguage", null, null, String.class, "preferredLanguage", null, false, false, false, "String", 0, 0, null, false, null, null, null, null, null, false); - protected final ColumnInfo _columnDepartmentNumber = cci("departmentNumber", "departmentNumber", null, null, String.class, "departmentNumber", null, false, false, false, "String", 0, 0, null, false, null, null, null, null, null, false); - protected final ColumnInfo _columnUidNumber = cci("uidNumber", "uidNumber", null, null, Long.class, "uidNumber", null, false, false, false, "Long", 0, 0, null, false, null, null, null, null, null, false); - protected final ColumnInfo _columnGidNumber = cci("gidNumber", "gidNumber", null, null, Long.class, "gidNumber", null, false, false, false, "Long", 0, 0, null, false, null, null, null, null, null, false); - protected final ColumnInfo _columnHomeDirectory = cci("homeDirectory", "homeDirectory", null, null, String.class, "homeDirectory", null, false, false, false, "String", 0, 0, null, false, null, null, null, null, null, false); - protected final ColumnInfo _columnGroups = cci("groups", "groups", null, null, String[].class, "groups", null, false, false, false, "String", 0, 0, null, false, null, null, null, null, null, false); - protected final ColumnInfo _columnRoles = cci("roles", "roles", null, null, String[].class, "roles", null, false, false, false, "String", 0, 0, null, false, null, null, null, null, null, false); + protected final ColumnInfo _columnName = cci("name", "name", null, null, String.class, "name", null, false, false, false, "String", 0, + 0, null, false, null, null, null, null, null, false); + protected final ColumnInfo _columnPassword = cci("password", "password", null, null, String.class, "password", null, false, false, + false, "String", 0, 0, null, false, null, null, null, null, null, false); + protected final ColumnInfo _columnSurname = cci("surname", "surname", null, null, String.class, "surname", null, false, false, false, + "String", 0, 0, null, false, null, null, null, null, null, false); + protected final ColumnInfo _columnGivenName = cci("givenName", "givenName", null, null, String.class, "givenName", null, false, false, + false, "String", 0, 0, null, false, null, null, null, null, null, false); + protected final ColumnInfo _columnEmployeeNumber = cci("employeeNumber", "employeeNumber", null, null, String.class, "employeeNumber", + null, false, false, false, "String", 0, 0, null, false, null, null, null, null, null, false); + protected final ColumnInfo _columnMail = cci("mail", "mail", null, null, String.class, "mail", null, false, false, false, "String", 0, + 0, null, false, null, null, null, null, null, false); + protected final ColumnInfo _columnTelephoneNumber = cci("telephoneNumber", "telephoneNumber", null, null, String.class, + "telephoneNumber", null, false, false, false, "String", 0, 0, null, false, null, null, null, null, null, false); + protected final ColumnInfo _columnHomePhone = cci("homePhone", "homePhone", null, null, String.class, "homePhone", null, false, false, + false, "String", 0, 0, null, false, null, null, null, null, null, false); + protected final ColumnInfo _columnHomePostalAddress = cci("homePostalAddress", "homePostalAddress", null, null, String.class, + "homePostalAddress", null, false, false, false, "String", 0, 0, null, false, null, null, null, null, null, false); + protected final ColumnInfo _columnLabeledURI = cci("labeledURI", "labeledURI", null, null, String.class, "labeledURI", null, false, + false, false, "String", 0, 0, null, false, null, null, null, null, null, false); + protected final ColumnInfo _columnRoomNumber = cci("roomNumber", "roomNumber", null, null, String.class, "roomNumber", null, false, + false, false, "String", 0, 0, null, false, null, null, null, null, null, false); + protected final ColumnInfo _columnDescription = cci("description", "description", null, null, String.class, "description", null, false, + false, false, "String", 0, 0, null, false, null, null, null, null, null, false); + protected final ColumnInfo _columnTitle = cci("title", "title", null, null, String.class, "title", null, false, false, false, "String", + 0, 0, null, false, null, null, null, null, null, false); + protected final ColumnInfo _columnPager = cci("pager", "pager", null, null, String.class, "pager", null, false, false, false, "String", + 0, 0, null, false, null, null, null, null, null, false); + protected final ColumnInfo _columnStreet = cci("street", "street", null, null, String.class, "street", null, false, false, false, + "String", 0, 0, null, false, null, null, null, null, null, false); + protected final ColumnInfo _columnPostalCode = cci("postalCode", "postalCode", null, null, String.class, "postalCode", null, false, + false, false, "String", 0, 0, null, false, null, null, null, null, null, false); + protected final ColumnInfo _columnPhysicalDeliveryOfficeName = cci("physicalDeliveryOfficeName", "physicalDeliveryOfficeName", null, + null, String.class, "physicalDeliveryOfficeName", null, false, false, false, "String", 0, 0, null, false, null, null, null, + null, null, false); + protected final ColumnInfo _columnDestinationIndicator = cci("destinationIndicator", "destinationIndicator", null, null, String.class, + "destinationIndicator", null, false, false, false, "String", 0, 0, null, false, null, null, null, null, null, false); + protected final ColumnInfo _columnInternationaliSDNNumber = cci("internationaliSDNNumber", "internationaliSDNNumber", null, null, + String.class, "internationaliSDNNumber", null, false, false, false, "String", 0, 0, null, false, null, null, null, null, null, + false); + protected final ColumnInfo _columnState = cci("state", "state", null, null, String.class, "state", null, false, false, false, "String", + 0, 0, null, false, null, null, null, null, null, false); + protected final ColumnInfo _columnEmployeeType = cci("employeeType", "employeeType", null, null, String.class, "employeeType", null, + false, false, false, "String", 0, 0, null, false, null, null, null, null, null, false); + protected final ColumnInfo _columnFacsimileTelephoneNumber = cci("facsimileTelephoneNumber", "facsimileTelephoneNumber", null, null, + String.class, "facsimileTelephoneNumber", null, false, false, false, "String", 0, 0, null, false, null, null, null, null, null, + false); + protected final ColumnInfo _columnPostOfficeBox = cci("postOfficeBox", "postOfficeBox", null, null, String.class, "postOfficeBox", + null, false, false, false, "String", 0, 0, null, false, null, null, null, null, null, false); + protected final ColumnInfo _columnInitials = cci("initials", "initials", null, null, String.class, "initials", null, false, false, + false, "String", 0, 0, null, false, null, null, null, null, null, false); + protected final ColumnInfo _columnCarLicense = cci("carLicense", "carLicense", null, null, String.class, "carLicense", null, false, + false, false, "String", 0, 0, null, false, null, null, null, null, null, false); + protected final ColumnInfo _columnMobile = cci("mobile", "mobile", null, null, String.class, "mobile", null, false, false, false, + "String", 0, 0, null, false, null, null, null, null, null, false); + protected final ColumnInfo _columnPostalAddress = cci("postalAddress", "postalAddress", null, null, String.class, "postalAddress", + null, false, false, false, "String", 0, 0, null, false, null, null, null, null, null, false); + protected final ColumnInfo _columnCity = cci("city", "city", null, null, String.class, "city", null, false, false, false, "String", 0, + 0, null, false, null, null, null, null, null, false); + protected final ColumnInfo _columnTeletexTerminalIdentifier = cci("teletexTerminalIdentifier", "teletexTerminalIdentifier", null, null, + String.class, "teletexTerminalIdentifier", null, false, false, false, "String", 0, 0, null, false, null, null, null, null, + null, false); + protected final ColumnInfo _columnX121Address = cci("x121Address", "x121Address", null, null, String.class, "x121Address", null, false, + false, false, "String", 0, 0, null, false, null, null, null, null, null, false); + protected final ColumnInfo _columnBusinessCategory = cci("businessCategory", "businessCategory", null, null, String.class, + "businessCategory", null, false, false, false, "String", 0, 0, null, false, null, null, null, null, null, false); + protected final ColumnInfo _columnRegisteredAddress = cci("registeredAddress", "registeredAddress", null, null, String.class, + "registeredAddress", null, false, false, false, "String", 0, 0, null, false, null, null, null, null, null, false); + protected final ColumnInfo _columnDisplayName = cci("displayName", "displayName", null, null, String.class, "displayName", null, false, + false, false, "String", 0, 0, null, false, null, null, null, null, null, false); + protected final ColumnInfo _columnPreferredLanguage = cci("preferredLanguage", "preferredLanguage", null, null, String.class, + "preferredLanguage", null, false, false, false, "String", 0, 0, null, false, null, null, null, null, null, false); + protected final ColumnInfo _columnDepartmentNumber = cci("departmentNumber", "departmentNumber", null, null, String.class, + "departmentNumber", null, false, false, false, "String", 0, 0, null, false, null, null, null, null, null, false); + protected final ColumnInfo _columnUidNumber = cci("uidNumber", "uidNumber", null, null, Long.class, "uidNumber", null, false, false, + false, "Long", 0, 0, null, false, null, null, null, null, null, false); + protected final ColumnInfo _columnGidNumber = cci("gidNumber", "gidNumber", null, null, Long.class, "gidNumber", null, false, false, + false, "Long", 0, 0, null, false, null, null, null, null, null, false); + protected final ColumnInfo _columnHomeDirectory = cci("homeDirectory", "homeDirectory", null, null, String.class, "homeDirectory", + null, false, false, false, "String", 0, 0, null, false, null, null, null, null, null, false); + protected final ColumnInfo _columnGroups = cci("groups", "groups", null, null, String[].class, "groups", null, false, false, false, + "String", 0, 0, null, false, null, null, null, null, null, false); + protected final ColumnInfo _columnRoles = cci("roles", "roles", null, null, String[].class, "roles", null, false, false, false, + "String", 0, 0, null, false, null, null, null, null, null, false); - public ColumnInfo columnName() { return _columnName; } - public ColumnInfo columnPassword() { return _columnPassword; } - public ColumnInfo columnSurname() { return _columnSurname; } - public ColumnInfo columnGivenName() { return _columnGivenName; } - public ColumnInfo columnEmployeeNumber() { return _columnEmployeeNumber; } - public ColumnInfo columnMail() { return _columnMail; } - public ColumnInfo columnTelephoneNumber() { return _columnTelephoneNumber; } - public ColumnInfo columnHomePhone() { return _columnHomePhone; } - public ColumnInfo columnHomePostalAddress() { return _columnHomePostalAddress; } - public ColumnInfo columnLabeledURI() { return _columnLabeledURI; } - public ColumnInfo columnRoomNumber() { return _columnRoomNumber; } - public ColumnInfo columnDescription() { return _columnDescription; } - public ColumnInfo columnTitle() { return _columnTitle; } - public ColumnInfo columnPager() { return _columnPager; } - public ColumnInfo columnStreet() { return _columnStreet; } - public ColumnInfo columnPostalCode() { return _columnPostalCode; } - public ColumnInfo columnPhysicalDeliveryOfficeName() { return _columnPhysicalDeliveryOfficeName; } - public ColumnInfo columnDestinationIndicator() { return _columnDestinationIndicator; } - public ColumnInfo columnInternationaliSDNNumber() { return _columnInternationaliSDNNumber; } - public ColumnInfo columnState() { return _columnState; } - public ColumnInfo columnEmployeeType() { return _columnEmployeeType; } - public ColumnInfo columnFacsimileTelephoneNumber() { return _columnFacsimileTelephoneNumber; } - public ColumnInfo columnPostOfficeBox() { return _columnPostOfficeBox; } - public ColumnInfo columnInitials() { return _columnInitials; } - public ColumnInfo columnCarLicense() { return _columnCarLicense; } - public ColumnInfo columnMobile() { return _columnMobile; } - public ColumnInfo columnPostalAddress() { return _columnPostalAddress; } - public ColumnInfo columnCity() { return _columnCity; } - public ColumnInfo columnTeletexTerminalIdentifier() { return _columnTeletexTerminalIdentifier; } - public ColumnInfo columnX121Address() { return _columnX121Address; } - public ColumnInfo columnBusinessCategory() { return _columnBusinessCategory; } - public ColumnInfo columnRegisteredAddress() { return _columnRegisteredAddress; } - public ColumnInfo columnDisplayName() { return _columnDisplayName; } - public ColumnInfo columnPreferredLanguage() { return _columnPreferredLanguage; } - public ColumnInfo columnDepartmentNumber() { return _columnDepartmentNumber; } - public ColumnInfo columnUidNumber() { return _columnUidNumber; } - public ColumnInfo columnGidNumber() { return _columnGidNumber; } - public ColumnInfo columnHomeDirectory() { return _columnHomeDirectory; } - public ColumnInfo columnGroups() { return _columnGroups; } - public ColumnInfo columnRoles() { return _columnRoles; } + public ColumnInfo columnName() { + return _columnName; + } + + public ColumnInfo columnPassword() { + return _columnPassword; + } + + public ColumnInfo columnSurname() { + return _columnSurname; + } + + public ColumnInfo columnGivenName() { + return _columnGivenName; + } + + public ColumnInfo columnEmployeeNumber() { + return _columnEmployeeNumber; + } + + public ColumnInfo columnMail() { + return _columnMail; + } + + public ColumnInfo columnTelephoneNumber() { + return _columnTelephoneNumber; + } + + public ColumnInfo columnHomePhone() { + return _columnHomePhone; + } + + public ColumnInfo columnHomePostalAddress() { + return _columnHomePostalAddress; + } + + public ColumnInfo columnLabeledURI() { + return _columnLabeledURI; + } + + public ColumnInfo columnRoomNumber() { + return _columnRoomNumber; + } + + public ColumnInfo columnDescription() { + return _columnDescription; + } + + public ColumnInfo columnTitle() { + return _columnTitle; + } + + public ColumnInfo columnPager() { + return _columnPager; + } + + public ColumnInfo columnStreet() { + return _columnStreet; + } + + public ColumnInfo columnPostalCode() { + return _columnPostalCode; + } + + public ColumnInfo columnPhysicalDeliveryOfficeName() { + return _columnPhysicalDeliveryOfficeName; + } + + public ColumnInfo columnDestinationIndicator() { + return _columnDestinationIndicator; + } + + public ColumnInfo columnInternationaliSDNNumber() { + return _columnInternationaliSDNNumber; + } + + public ColumnInfo columnState() { + return _columnState; + } + + public ColumnInfo columnEmployeeType() { + return _columnEmployeeType; + } + + public ColumnInfo columnFacsimileTelephoneNumber() { + return _columnFacsimileTelephoneNumber; + } + + public ColumnInfo columnPostOfficeBox() { + return _columnPostOfficeBox; + } + + public ColumnInfo columnInitials() { + return _columnInitials; + } + + public ColumnInfo columnCarLicense() { + return _columnCarLicense; + } + + public ColumnInfo columnMobile() { + return _columnMobile; + } + + public ColumnInfo columnPostalAddress() { + return _columnPostalAddress; + } + + public ColumnInfo columnCity() { + return _columnCity; + } + + public ColumnInfo columnTeletexTerminalIdentifier() { + return _columnTeletexTerminalIdentifier; + } + + public ColumnInfo columnX121Address() { + return _columnX121Address; + } + + public ColumnInfo columnBusinessCategory() { + return _columnBusinessCategory; + } + + public ColumnInfo columnRegisteredAddress() { + return _columnRegisteredAddress; + } + + public ColumnInfo columnDisplayName() { + return _columnDisplayName; + } + + public ColumnInfo columnPreferredLanguage() { + return _columnPreferredLanguage; + } + + public ColumnInfo columnDepartmentNumber() { + return _columnDepartmentNumber; + } + + public ColumnInfo columnUidNumber() { + return _columnUidNumber; + } + + public ColumnInfo columnGidNumber() { + return _columnGidNumber; + } + + public ColumnInfo columnHomeDirectory() { + return _columnHomeDirectory; + } + + public ColumnInfo columnGroups() { + return _columnGroups; + } + + public ColumnInfo columnRoles() { + return _columnRoles; + } protected List ccil() { List ls = newArrayList(); @@ -344,4 +537,3 @@ public class UserDbm extends AbstractDBMeta { return null; } } - diff --git a/src/main/java/org/codelibs/fess/es/user/cbean/bs/BsGroupCB.java b/src/main/java/org/codelibs/fess/es/user/cbean/bs/BsGroupCB.java index 2ff4346d1..47825ce03 100644 --- a/src/main/java/org/codelibs/fess/es/user/cbean/bs/BsGroupCB.java +++ b/src/main/java/org/codelibs/fess/es/user/cbean/bs/BsGroupCB.java @@ -75,7 +75,7 @@ public class BsGroupCB extends EsAbstractConditionBean { @Override public void acceptPrimaryKeyMap(Map primaryKeyMap) { - acceptPK((String)primaryKeyMap.get("_id")); + acceptPK((String) primaryKeyMap.get("_id")); } // =================================================================================== @@ -161,6 +161,7 @@ public class BsGroupCB extends EsAbstractConditionBean { public void columnName() { doColumn("name"); } + public void columnGidNumber() { doColumn("gidNumber"); } diff --git a/src/main/java/org/codelibs/fess/es/user/cbean/bs/BsRoleCB.java b/src/main/java/org/codelibs/fess/es/user/cbean/bs/BsRoleCB.java index d7d19ea8b..5f1db11d1 100644 --- a/src/main/java/org/codelibs/fess/es/user/cbean/bs/BsRoleCB.java +++ b/src/main/java/org/codelibs/fess/es/user/cbean/bs/BsRoleCB.java @@ -75,7 +75,7 @@ public class BsRoleCB extends EsAbstractConditionBean { @Override public void acceptPrimaryKeyMap(Map primaryKeyMap) { - acceptPK((String)primaryKeyMap.get("_id")); + acceptPK((String) primaryKeyMap.get("_id")); } // =================================================================================== diff --git a/src/main/java/org/codelibs/fess/es/user/cbean/bs/BsUserCB.java b/src/main/java/org/codelibs/fess/es/user/cbean/bs/BsUserCB.java index 717f8ed07..8c846499c 100644 --- a/src/main/java/org/codelibs/fess/es/user/cbean/bs/BsUserCB.java +++ b/src/main/java/org/codelibs/fess/es/user/cbean/bs/BsUserCB.java @@ -75,7 +75,7 @@ public class BsUserCB extends EsAbstractConditionBean { @Override public void acceptPrimaryKeyMap(Map primaryKeyMap) { - acceptPK((String)primaryKeyMap.get("_id")); + acceptPK((String) primaryKeyMap.get("_id")); } // =================================================================================== @@ -161,120 +161,159 @@ public class BsUserCB extends EsAbstractConditionBean { public void columnName() { doColumn("name"); } + public void columnPassword() { doColumn("password"); } + public void columnSurname() { doColumn("surname"); } + public void columnGivenName() { doColumn("givenName"); } + public void columnEmployeeNumber() { doColumn("employeeNumber"); } + public void columnMail() { doColumn("mail"); } + public void columnTelephoneNumber() { doColumn("telephoneNumber"); } + public void columnHomePhone() { doColumn("homePhone"); } + public void columnHomePostalAddress() { doColumn("homePostalAddress"); } + public void columnLabeledURI() { doColumn("labeledURI"); } + public void columnRoomNumber() { doColumn("roomNumber"); } + public void columnDescription() { doColumn("description"); } + public void columnTitle() { doColumn("title"); } + public void columnPager() { doColumn("pager"); } + public void columnStreet() { doColumn("street"); } + public void columnPostalCode() { doColumn("postalCode"); } + public void columnPhysicalDeliveryOfficeName() { doColumn("physicalDeliveryOfficeName"); } + public void columnDestinationIndicator() { doColumn("destinationIndicator"); } + public void columnInternationaliSDNNumber() { doColumn("internationaliSDNNumber"); } + public void columnState() { doColumn("state"); } + public void columnEmployeeType() { doColumn("employeeType"); } + public void columnFacsimileTelephoneNumber() { doColumn("facsimileTelephoneNumber"); } + public void columnPostOfficeBox() { doColumn("postOfficeBox"); } + public void columnInitials() { doColumn("initials"); } + public void columnCarLicense() { doColumn("carLicense"); } + public void columnMobile() { doColumn("mobile"); } + public void columnPostalAddress() { doColumn("postalAddress"); } + public void columnCity() { doColumn("city"); } + public void columnTeletexTerminalIdentifier() { doColumn("teletexTerminalIdentifier"); } + public void columnX121Address() { doColumn("x121Address"); } + public void columnBusinessCategory() { doColumn("businessCategory"); } + public void columnRegisteredAddress() { doColumn("registeredAddress"); } + public void columnDisplayName() { doColumn("displayName"); } + public void columnPreferredLanguage() { doColumn("preferredLanguage"); } + public void columnDepartmentNumber() { doColumn("departmentNumber"); } + public void columnUidNumber() { doColumn("uidNumber"); } + public void columnGidNumber() { doColumn("gidNumber"); } + public void columnHomeDirectory() { doColumn("homeDirectory"); } + public void columnGroups() { doColumn("groups"); } + public void columnRoles() { doColumn("roles"); } diff --git a/src/main/java/org/codelibs/fess/es/user/cbean/cq/bs/BsGroupCQ.java b/src/main/java/org/codelibs/fess/es/user/cbean/cq/bs/BsGroupCQ.java index 14c436984..f70774283 100644 --- a/src/main/java/org/codelibs/fess/es/user/cbean/cq/bs/BsGroupCQ.java +++ b/src/main/java/org/codelibs/fess/es/user/cbean/cq/bs/BsGroupCQ.java @@ -15,7 +15,7 @@ */ package org.codelibs.fess.es.user.cbean.cq.bs; -import java.time.*; +import java.time.LocalDateTime; import java.util.Collection; import org.codelibs.fess.es.user.allcommon.EsAbstractConditionQuery; @@ -33,7 +33,6 @@ import org.elasticsearch.index.query.RangeQueryBuilder; import org.elasticsearch.index.query.TermQueryBuilder; import org.elasticsearch.index.query.TermsQueryBuilder; - /** * @author ESFlute (using FreeGen) */ @@ -61,9 +60,8 @@ public abstract class BsGroupCQ extends EsAbstractConditionQuery { filtered(filteredLambda, null); } - public void filtered(FilteredCall filteredLambda, - ConditionOptionCall opLambda) { - bool((must, should, mustNot, filter)->{ + public void filtered(FilteredCall filteredLambda, ConditionOptionCall opLambda) { + bool((must, should, mustNot, filter) -> { filteredLambda.callback(must, filter); }, opLambda); } @@ -98,7 +96,9 @@ public abstract class BsGroupCQ extends EsAbstractConditionQuery { GroupCQ filterQuery = new GroupCQ(); boolLambda.callback(mustQuery, shouldQuery, mustNotQuery, filterQuery); if (mustQuery.hasQueries() || shouldQuery.hasQueries() || mustNotQuery.hasQueries() || filterQuery.hasQueries()) { - BoolQueryBuilder builder = regBoolCQ(mustQuery.getQueryBuilderList(), shouldQuery.getQueryBuilderList(), mustNotQuery.getQueryBuilderList(), filterQuery.getQueryBuilderList()); + BoolQueryBuilder builder = + regBoolCQ(mustQuery.getQueryBuilderList(), shouldQuery.getQueryBuilderList(), mustNotQuery.getQueryBuilderList(), + filterQuery.getQueryBuilderList()); if (opLambda != null) { opLambda.callback(builder); } diff --git a/src/main/java/org/codelibs/fess/es/user/cbean/cq/bs/BsRoleCQ.java b/src/main/java/org/codelibs/fess/es/user/cbean/cq/bs/BsRoleCQ.java index c0d578102..105c6f839 100644 --- a/src/main/java/org/codelibs/fess/es/user/cbean/cq/bs/BsRoleCQ.java +++ b/src/main/java/org/codelibs/fess/es/user/cbean/cq/bs/BsRoleCQ.java @@ -15,7 +15,7 @@ */ package org.codelibs.fess.es.user.cbean.cq.bs; -import java.time.*; +import java.time.LocalDateTime; import java.util.Collection; import org.codelibs.fess.es.user.allcommon.EsAbstractConditionQuery; @@ -33,7 +33,6 @@ import org.elasticsearch.index.query.RangeQueryBuilder; import org.elasticsearch.index.query.TermQueryBuilder; import org.elasticsearch.index.query.TermsQueryBuilder; - /** * @author ESFlute (using FreeGen) */ @@ -61,9 +60,8 @@ public abstract class BsRoleCQ extends EsAbstractConditionQuery { filtered(filteredLambda, null); } - public void filtered(FilteredCall filteredLambda, - ConditionOptionCall opLambda) { - bool((must, should, mustNot, filter)->{ + public void filtered(FilteredCall filteredLambda, ConditionOptionCall opLambda) { + bool((must, should, mustNot, filter) -> { filteredLambda.callback(must, filter); }, opLambda); } @@ -98,7 +96,9 @@ public abstract class BsRoleCQ extends EsAbstractConditionQuery { RoleCQ filterQuery = new RoleCQ(); boolLambda.callback(mustQuery, shouldQuery, mustNotQuery, filterQuery); if (mustQuery.hasQueries() || shouldQuery.hasQueries() || mustNotQuery.hasQueries() || filterQuery.hasQueries()) { - BoolQueryBuilder builder = regBoolCQ(mustQuery.getQueryBuilderList(), shouldQuery.getQueryBuilderList(), mustNotQuery.getQueryBuilderList(), filterQuery.getQueryBuilderList()); + BoolQueryBuilder builder = + regBoolCQ(mustQuery.getQueryBuilderList(), shouldQuery.getQueryBuilderList(), mustNotQuery.getQueryBuilderList(), + filterQuery.getQueryBuilderList()); if (opLambda != null) { opLambda.callback(builder); } diff --git a/src/main/java/org/codelibs/fess/es/user/cbean/cq/bs/BsUserCQ.java b/src/main/java/org/codelibs/fess/es/user/cbean/cq/bs/BsUserCQ.java index 2cd61d423..9944f7e3a 100644 --- a/src/main/java/org/codelibs/fess/es/user/cbean/cq/bs/BsUserCQ.java +++ b/src/main/java/org/codelibs/fess/es/user/cbean/cq/bs/BsUserCQ.java @@ -15,7 +15,7 @@ */ package org.codelibs.fess.es.user.cbean.cq.bs; -import java.time.*; +import java.time.LocalDateTime; import java.util.Collection; import org.codelibs.fess.es.user.allcommon.EsAbstractConditionQuery; @@ -33,7 +33,6 @@ import org.elasticsearch.index.query.RangeQueryBuilder; import org.elasticsearch.index.query.TermQueryBuilder; import org.elasticsearch.index.query.TermsQueryBuilder; - /** * @author ESFlute (using FreeGen) */ @@ -61,9 +60,8 @@ public abstract class BsUserCQ extends EsAbstractConditionQuery { filtered(filteredLambda, null); } - public void filtered(FilteredCall filteredLambda, - ConditionOptionCall opLambda) { - bool((must, should, mustNot, filter)->{ + public void filtered(FilteredCall filteredLambda, ConditionOptionCall opLambda) { + bool((must, should, mustNot, filter) -> { filteredLambda.callback(must, filter); }, opLambda); } @@ -98,7 +96,9 @@ public abstract class BsUserCQ extends EsAbstractConditionQuery { UserCQ filterQuery = new UserCQ(); boolLambda.callback(mustQuery, shouldQuery, mustNotQuery, filterQuery); if (mustQuery.hasQueries() || shouldQuery.hasQueries() || mustNotQuery.hasQueries() || filterQuery.hasQueries()) { - BoolQueryBuilder builder = regBoolCQ(mustQuery.getQueryBuilderList(), shouldQuery.getQueryBuilderList(), mustNotQuery.getQueryBuilderList(), filterQuery.getQueryBuilderList()); + BoolQueryBuilder builder = + regBoolCQ(mustQuery.getQueryBuilderList(), shouldQuery.getQueryBuilderList(), mustNotQuery.getQueryBuilderList(), + filterQuery.getQueryBuilderList()); if (opLambda != null) { opLambda.callback(builder); } @@ -2873,7 +2873,8 @@ public abstract class BsUserCQ extends EsAbstractConditionQuery { setPhysicalDeliveryOfficeName_Terms(physicalDeliveryOfficeNameList, null); } - public void setPhysicalDeliveryOfficeName_Terms(Collection physicalDeliveryOfficeNameList, ConditionOptionCall opLambda) { + public void setPhysicalDeliveryOfficeName_Terms(Collection physicalDeliveryOfficeNameList, + ConditionOptionCall opLambda) { TermsQueryBuilder builder = regTermsQ("physicalDeliveryOfficeName", physicalDeliveryOfficeNameList); if (opLambda != null) { opLambda.callback(builder); @@ -2884,7 +2885,8 @@ public abstract class BsUserCQ extends EsAbstractConditionQuery { setPhysicalDeliveryOfficeName_Terms(physicalDeliveryOfficeNameList, null); } - public void setPhysicalDeliveryOfficeName_InScope(Collection physicalDeliveryOfficeNameList, ConditionOptionCall opLambda) { + public void setPhysicalDeliveryOfficeName_InScope(Collection physicalDeliveryOfficeNameList, + ConditionOptionCall opLambda) { setPhysicalDeliveryOfficeName_Terms(physicalDeliveryOfficeNameList, opLambda); } @@ -2914,7 +2916,8 @@ public abstract class BsUserCQ extends EsAbstractConditionQuery { setPhysicalDeliveryOfficeName_MatchPhrasePrefix(physicalDeliveryOfficeName, null); } - public void setPhysicalDeliveryOfficeName_MatchPhrasePrefix(String physicalDeliveryOfficeName, ConditionOptionCall opLambda) { + public void setPhysicalDeliveryOfficeName_MatchPhrasePrefix(String physicalDeliveryOfficeName, + ConditionOptionCall opLambda) { MatchQueryBuilder builder = regMatchPhrasePrefixQ("physicalDeliveryOfficeName", physicalDeliveryOfficeName); if (opLambda != null) { opLambda.callback(builder); @@ -2969,7 +2972,8 @@ public abstract class BsUserCQ extends EsAbstractConditionQuery { setPhysicalDeliveryOfficeName_GreaterEqual(physicalDeliveryOfficeName, null); } - public void setPhysicalDeliveryOfficeName_GreaterEqual(String physicalDeliveryOfficeName, ConditionOptionCall opLambda) { + public void setPhysicalDeliveryOfficeName_GreaterEqual(String physicalDeliveryOfficeName, + ConditionOptionCall opLambda) { RangeQueryBuilder builder = regRangeQ("physicalDeliveryOfficeName", ConditionKey.CK_GREATER_EQUAL, physicalDeliveryOfficeName); if (opLambda != null) { opLambda.callback(builder); @@ -3205,7 +3209,8 @@ public abstract class BsUserCQ extends EsAbstractConditionQuery { setInternationaliSDNNumber_Terms(internationaliSDNNumberList, null); } - public void setInternationaliSDNNumber_Terms(Collection internationaliSDNNumberList, ConditionOptionCall opLambda) { + public void setInternationaliSDNNumber_Terms(Collection internationaliSDNNumberList, + ConditionOptionCall opLambda) { TermsQueryBuilder builder = regTermsQ("internationaliSDNNumber", internationaliSDNNumberList); if (opLambda != null) { opLambda.callback(builder); @@ -3216,7 +3221,8 @@ public abstract class BsUserCQ extends EsAbstractConditionQuery { setInternationaliSDNNumber_Terms(internationaliSDNNumberList, null); } - public void setInternationaliSDNNumber_InScope(Collection internationaliSDNNumberList, ConditionOptionCall opLambda) { + public void setInternationaliSDNNumber_InScope(Collection internationaliSDNNumberList, + ConditionOptionCall opLambda) { setInternationaliSDNNumber_Terms(internationaliSDNNumberList, opLambda); } @@ -3703,7 +3709,8 @@ public abstract class BsUserCQ extends EsAbstractConditionQuery { setFacsimileTelephoneNumber_Terms(facsimileTelephoneNumberList, null); } - public void setFacsimileTelephoneNumber_Terms(Collection facsimileTelephoneNumberList, ConditionOptionCall opLambda) { + public void setFacsimileTelephoneNumber_Terms(Collection facsimileTelephoneNumberList, + ConditionOptionCall opLambda) { TermsQueryBuilder builder = regTermsQ("facsimileTelephoneNumber", facsimileTelephoneNumberList); if (opLambda != null) { opLambda.callback(builder); @@ -3714,7 +3721,8 @@ public abstract class BsUserCQ extends EsAbstractConditionQuery { setFacsimileTelephoneNumber_Terms(facsimileTelephoneNumberList, null); } - public void setFacsimileTelephoneNumber_InScope(Collection facsimileTelephoneNumberList, ConditionOptionCall opLambda) { + public void setFacsimileTelephoneNumber_InScope(Collection facsimileTelephoneNumberList, + ConditionOptionCall opLambda) { setFacsimileTelephoneNumber_Terms(facsimileTelephoneNumberList, opLambda); } @@ -3744,7 +3752,8 @@ public abstract class BsUserCQ extends EsAbstractConditionQuery { setFacsimileTelephoneNumber_MatchPhrasePrefix(facsimileTelephoneNumber, null); } - public void setFacsimileTelephoneNumber_MatchPhrasePrefix(String facsimileTelephoneNumber, ConditionOptionCall opLambda) { + public void setFacsimileTelephoneNumber_MatchPhrasePrefix(String facsimileTelephoneNumber, + ConditionOptionCall opLambda) { MatchQueryBuilder builder = regMatchPhrasePrefixQ("facsimileTelephoneNumber", facsimileTelephoneNumber); if (opLambda != null) { opLambda.callback(builder); @@ -4865,7 +4874,8 @@ public abstract class BsUserCQ extends EsAbstractConditionQuery { setTeletexTerminalIdentifier_Terms(teletexTerminalIdentifierList, null); } - public void setTeletexTerminalIdentifier_Terms(Collection teletexTerminalIdentifierList, ConditionOptionCall opLambda) { + public void setTeletexTerminalIdentifier_Terms(Collection teletexTerminalIdentifierList, + ConditionOptionCall opLambda) { TermsQueryBuilder builder = regTermsQ("teletexTerminalIdentifier", teletexTerminalIdentifierList); if (opLambda != null) { opLambda.callback(builder); @@ -4876,7 +4886,8 @@ public abstract class BsUserCQ extends EsAbstractConditionQuery { setTeletexTerminalIdentifier_Terms(teletexTerminalIdentifierList, null); } - public void setTeletexTerminalIdentifier_InScope(Collection teletexTerminalIdentifierList, ConditionOptionCall opLambda) { + public void setTeletexTerminalIdentifier_InScope(Collection teletexTerminalIdentifierList, + ConditionOptionCall opLambda) { setTeletexTerminalIdentifier_Terms(teletexTerminalIdentifierList, opLambda); } @@ -4906,7 +4917,8 @@ public abstract class BsUserCQ extends EsAbstractConditionQuery { setTeletexTerminalIdentifier_MatchPhrasePrefix(teletexTerminalIdentifier, null); } - public void setTeletexTerminalIdentifier_MatchPhrasePrefix(String teletexTerminalIdentifier, ConditionOptionCall opLambda) { + public void setTeletexTerminalIdentifier_MatchPhrasePrefix(String teletexTerminalIdentifier, + ConditionOptionCall opLambda) { MatchQueryBuilder builder = regMatchPhrasePrefixQ("teletexTerminalIdentifier", teletexTerminalIdentifier); if (opLambda != null) { opLambda.callback(builder); diff --git a/src/main/java/org/codelibs/fess/mylasta/action/FessLabels.java b/src/main/java/org/codelibs/fess/mylasta/action/FessLabels.java index ed1db0e8d..ec741071c 100644 --- a/src/main/java/org/codelibs/fess/mylasta/action/FessLabels.java +++ b/src/main/java/org/codelibs/fess/mylasta/action/FessLabels.java @@ -1542,7 +1542,8 @@ public class FessLabels extends ActionMessages { public static final String LABELS_system_info_bug_report_title = "{labels.system_info_bug_report_title}"; /** The key of the message: system.properties does not exist. Default values are applied. */ - public static final String LABELS_system_info_system_properties_does_not_exist = "{labels.system_info_system_properties_does_not_exist}"; + public static final String LABELS_system_info_system_properties_does_not_exist = + "{labels.system_info_system_properties_does_not_exist}"; /** The key of the message: File Authentication */ public static final String LABELS_file_auth_configuration = "{labels.file_auth_configuration}"; diff --git a/src/main/java/org/codelibs/fess/mylasta/action/FessMessages.java b/src/main/java/org/codelibs/fess/mylasta/action/FessMessages.java index d4c30ba21..fa775a64b 100644 --- a/src/main/java/org/codelibs/fess/mylasta/action/FessMessages.java +++ b/src/main/java/org/codelibs/fess/mylasta/action/FessMessages.java @@ -15,7 +15,6 @@ */ package org.codelibs.fess.mylasta.action; -import org.codelibs.fess.mylasta.action.FessLabels; import org.lastaflute.web.ruts.message.ActionMessage; /** diff --git a/src/main/java/org/codelibs/fess/mylasta/direction/FessConfig.java b/src/main/java/org/codelibs/fess/mylasta/direction/FessConfig.java index e85b42b0d..8a61a2cd2 100644 --- a/src/main/java/org/codelibs/fess/mylasta/direction/FessConfig.java +++ b/src/main/java/org/codelibs/fess/mylasta/direction/FessConfig.java @@ -15,7 +15,6 @@ */ package org.codelibs.fess.mylasta.direction; -import org.codelibs.fess.mylasta.direction.FessEnv; import org.lastaflute.core.direction.exception.ConfigPropertyNotFoundException; /** @@ -42,37 +41,37 @@ public interface FessConfig extends FessEnv, org.codelibs.fess.mylasta.direction String APP_DIGEST_ALGORISM = "app.digest.algorism"; /** The key of the configuration. e.g. -Djava.awt.headless=true --server --Xmx512m --XX:MaxMetaspaceSize=128m --XX:CompressedClassSpaceSize=32m --XX:-UseGCOverheadLimit --XX:+UseConcMarkSweepGC --XX:CMSInitiatingOccupancyFraction=75 --XX:+UseParNewGC --XX:+UseTLAB --XX:+DisableExplicitGC --XX:-OmitStackTraceInFastThrow --Djcifs.smb.client.connTimeout=60000 --Djcifs.smb.client.soTimeout=35000 --Djcifs.smb.client.responseTimeout=30000 --Dgroovy.use.classvalue=true - */ + -server + -Xmx512m + -XX:MaxMetaspaceSize=128m + -XX:CompressedClassSpaceSize=32m + -XX:-UseGCOverheadLimit + -XX:+UseConcMarkSweepGC + -XX:CMSInitiatingOccupancyFraction=75 + -XX:+UseParNewGC + -XX:+UseTLAB + -XX:+DisableExplicitGC + -XX:-OmitStackTraceInFastThrow + -Djcifs.smb.client.connTimeout=60000 + -Djcifs.smb.client.soTimeout=35000 + -Djcifs.smb.client.responseTimeout=30000 + -Dgroovy.use.classvalue=true + */ String JVM_CRAWLER_OPTIONS = "jvm.crawler.options"; /** The key of the configuration. e.g. -Djava.awt.headless=true --server --Xmx256m --XX:MaxMetaspaceSize=128m --XX:CompressedClassSpaceSize=32m --XX:-UseGCOverheadLimit --XX:+UseConcMarkSweepGC --XX:CMSInitiatingOccupancyFraction=75 --XX:+UseParNewGC --XX:+UseTLAB --XX:+DisableExplicitGC --Dgroovy.use.classvalue=true - */ + -server + -Xmx256m + -XX:MaxMetaspaceSize=128m + -XX:CompressedClassSpaceSize=32m + -XX:-UseGCOverheadLimit + -XX:+UseConcMarkSweepGC + -XX:CMSInitiatingOccupancyFraction=75 + -XX:+UseParNewGC + -XX:+UseTLAB + -XX:+DisableExplicitGC + -Dgroovy.use.classvalue=true + */ String JVM_SUGGEST_OPTIONS = "jvm.suggest.options"; /** The key of the configuration. e.g. default_crawler */ @@ -154,8 +153,8 @@ public interface FessConfig extends FessEnv, org.codelibs.fess.mylasta.direction String CRAWLER_METADATA_CONTENT_EXCLUDES = "crawler.metadata.content.excludes"; /** The key of the configuration. e.g. title=title:string -Title=title:string - */ + Title=title:string + */ String CRAWLER_METADATA_NAME_MAPPING = "crawler.metadata.name.mapping"; /** The key of the configuration. e.g. //BODY */ @@ -381,54 +380,54 @@ Title=title:string String QUERY_DEFAULT_LANGUAGES = "query.default.languages"; /** The key of the configuration. e.g. ar=ar -bg=bg -bn=bn -ca=ca -cs=cs -da=da -de=de -el=el -en=en -es=es -et=et -fa=fa -fi=fi -fr=fr -gu=gu -he=he -hi=hi -hr=hr -hu=hu -id=id -it=it -ja=ja -ko=ko -lt=lt -lv=lv -mk=mk -ml=ml -nl=nl -no=no -pa=pa -pl=pl -pt=pt -ro=ro -ru=ru -si=si -sq=sq -sv=sv -ta=ta -te=te -th=th -tl=tl -tr=tr -uk=uk -ur=ur -vi=vi -zh=zh-cn -zh-cn=zh-cn -zh-tw=zh-tw - */ + bg=bg + bn=bn + ca=ca + cs=cs + da=da + de=de + el=el + en=en + es=es + et=et + fa=fa + fi=fi + fr=fr + gu=gu + he=he + hi=hi + hr=hr + hu=hu + id=id + it=it + ja=ja + ko=ko + lt=lt + lv=lv + mk=mk + ml=ml + nl=nl + no=no + pa=pa + pl=pl + pt=pt + ro=ro + ru=ru + si=si + sq=sq + sv=sv + ta=ta + te=te + th=th + tl=tl + tr=tr + uk=uk + ur=ur + vi=vi + zh=zh-cn + zh-cn=zh-cn + zh-tw=zh-tw + */ String QUERY_LANGUAGE_MAPPING = "query.language.mapping"; /** The key of the configuration. e.g. 1.6 */ @@ -978,22 +977,22 @@ zh-tw=zh-tw /** * Get the value for the key 'jvm.crawler.options'.
* The value is, e.g. -Djava.awt.headless=true --server --Xmx512m --XX:MaxMetaspaceSize=128m --XX:CompressedClassSpaceSize=32m --XX:-UseGCOverheadLimit --XX:+UseConcMarkSweepGC --XX:CMSInitiatingOccupancyFraction=75 --XX:+UseParNewGC --XX:+UseTLAB --XX:+DisableExplicitGC --XX:-OmitStackTraceInFastThrow --Djcifs.smb.client.connTimeout=60000 --Djcifs.smb.client.soTimeout=35000 --Djcifs.smb.client.responseTimeout=30000 --Dgroovy.use.classvalue=true -
+ -server + -Xmx512m + -XX:MaxMetaspaceSize=128m + -XX:CompressedClassSpaceSize=32m + -XX:-UseGCOverheadLimit + -XX:+UseConcMarkSweepGC + -XX:CMSInitiatingOccupancyFraction=75 + -XX:+UseParNewGC + -XX:+UseTLAB + -XX:+DisableExplicitGC + -XX:-OmitStackTraceInFastThrow + -Djcifs.smb.client.connTimeout=60000 + -Djcifs.smb.client.soTimeout=35000 + -Djcifs.smb.client.responseTimeout=30000 + -Dgroovy.use.classvalue=true +
* comment: JVM options * @return The value of found property. (NotNull: if not found, exception but basically no way) */ @@ -1002,18 +1001,18 @@ zh-tw=zh-tw /** * Get the value for the key 'jvm.suggest.options'.
* The value is, e.g. -Djava.awt.headless=true --server --Xmx256m --XX:MaxMetaspaceSize=128m --XX:CompressedClassSpaceSize=32m --XX:-UseGCOverheadLimit --XX:+UseConcMarkSweepGC --XX:CMSInitiatingOccupancyFraction=75 --XX:+UseParNewGC --XX:+UseTLAB --XX:+DisableExplicitGC --Dgroovy.use.classvalue=true -
+ -server + -Xmx256m + -XX:MaxMetaspaceSize=128m + -XX:CompressedClassSpaceSize=32m + -XX:-UseGCOverheadLimit + -XX:+UseConcMarkSweepGC + -XX:CMSInitiatingOccupancyFraction=75 + -XX:+UseParNewGC + -XX:+UseTLAB + -XX:+DisableExplicitGC + -Dgroovy.use.classvalue=true +
* @return The value of found property. (NotNull: if not found, exception but basically no way) */ String getJvmSuggestOptions(); @@ -1266,8 +1265,8 @@ zh-tw=zh-tw /** * Get the value for the key 'crawler.metadata.name.mapping'.
* The value is, e.g. title=title:string -Title=title:string -
+ Title=title:string +
* @return The value of found property. (NotNull: if not found, exception but basically no way) */ String getCrawlerMetadataNameMapping(); @@ -1990,54 +1989,54 @@ Title=title:string /** * Get the value for the key 'query.language.mapping'.
* The value is, e.g. ar=ar -bg=bg -bn=bn -ca=ca -cs=cs -da=da -de=de -el=el -en=en -es=es -et=et -fa=fa -fi=fi -fr=fr -gu=gu -he=he -hi=hi -hr=hr -hu=hu -id=id -it=it -ja=ja -ko=ko -lt=lt -lv=lv -mk=mk -ml=ml -nl=nl -no=no -pa=pa -pl=pl -pt=pt -ro=ro -ru=ru -si=si -sq=sq -sv=sv -ta=ta -te=te -th=th -tl=tl -tr=tr -uk=uk -ur=ur -vi=vi -zh=zh-cn -zh-cn=zh-cn -zh-tw=zh-tw -
+ bg=bg + bn=bn + ca=ca + cs=cs + da=da + de=de + el=el + en=en + es=es + et=et + fa=fa + fi=fi + fr=fr + gu=gu + he=he + hi=hi + hr=hr + hu=hu + id=id + it=it + ja=ja + ko=ko + lt=lt + lv=lv + mk=mk + ml=ml + nl=nl + no=no + pa=pa + pl=pl + pt=pt + ro=ro + ru=ru + si=si + sq=sq + sv=sv + ta=ta + te=te + th=th + tl=tl + tr=tr + uk=uk + ur=ur + vi=vi + zh=zh-cn + zh-cn=zh-cn + zh-tw=zh-tw +
* @return The value of found property. (NotNull: if not found, exception but basically no way) */ String getQueryLanguageMapping(); diff --git a/src/main/java/org/codelibs/fess/mylasta/mail/CrawlerPostcard.java b/src/main/java/org/codelibs/fess/mylasta/mail/CrawlerPostcard.java index 731d77519..98c79e788 100644 --- a/src/main/java/org/codelibs/fess/mylasta/mail/CrawlerPostcard.java +++ b/src/main/java/org/codelibs/fess/mylasta/mail/CrawlerPostcard.java @@ -50,7 +50,9 @@ public class CrawlerPostcard extends LaTypicalPostcard { @Override protected String[] getPropertyNames() { - return new String[] {"hostname", "webFsCrawlStartTime", "webFsCrawlEndTime", "webFsCrawlExecTime", "webFsIndexExecTime", "webFsIndexSize", "dataCrawlStartTime", "dataCrawlEndTime", "dataCrawlExecTime", "dataIndexExecTime", "dataFsIndexSize", "crawlerStartTime", "crawlerEndTime", "crawlerExecTime", "status"}; + return new String[] { "hostname", "webFsCrawlStartTime", "webFsCrawlEndTime", "webFsCrawlExecTime", "webFsIndexExecTime", + "webFsIndexSize", "dataCrawlStartTime", "dataCrawlEndTime", "dataCrawlExecTime", "dataIndexExecTime", "dataFsIndexSize", + "crawlerStartTime", "crawlerEndTime", "crawlerExecTime", "status" }; } // =================================================================================== diff --git a/src/main/java/org/codelibs/fess/mylasta/mail/EsStatusPostcard.java b/src/main/java/org/codelibs/fess/mylasta/mail/EsStatusPostcard.java index 3fd9f9fad..9ebcac090 100644 --- a/src/main/java/org/codelibs/fess/mylasta/mail/EsStatusPostcard.java +++ b/src/main/java/org/codelibs/fess/mylasta/mail/EsStatusPostcard.java @@ -50,7 +50,7 @@ public class EsStatusPostcard extends LaTypicalPostcard { @Override protected String[] getPropertyNames() { - return new String[] {"hostname", "server", "statusBefore", "statusAfter", "indexBefore", "indexAfter"}; + return new String[] { "hostname", "server", "statusBefore", "statusAfter", "indexBefore", "indexAfter" }; } // =================================================================================== diff --git a/src/main/java/org/codelibs/fess/mylasta/mail/TestmailPostcard.java b/src/main/java/org/codelibs/fess/mylasta/mail/TestmailPostcard.java index f8630d055..e9ddae103 100644 --- a/src/main/java/org/codelibs/fess/mylasta/mail/TestmailPostcard.java +++ b/src/main/java/org/codelibs/fess/mylasta/mail/TestmailPostcard.java @@ -50,7 +50,7 @@ public class TestmailPostcard extends LaTypicalPostcard { @Override protected String[] getPropertyNames() { - return new String[] {"hostname"}; + return new String[] { "hostname" }; } // ===================================================================================