fix #540 : update ESFlute

dbflute_fess/dfprop/esfluteMap.dfprop

@@ -31,5 +31,5 @@ map:{
             }
         }
     }
-    ; elasticsearchVersion = 2.0.0
+    ; elasticsearchVersion = 2.3.3
 }

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

@@ -37,7 +37,6 @@ import org.dbflute.dbmeta.accessory.DerivedTypeHandler;
 import org.dbflute.jdbc.StatementConfig;
 import org.dbflute.system.DBFluteSystem;
 import org.dbflute.twowaysql.style.BoundDateDisplayStyle;
-import org.elasticsearch.action.count.CountRequestBuilder;
 import org.elasticsearch.action.search.SearchRequestBuilder;
 import org.elasticsearch.common.unit.TimeValue;
 
@@ -57,8 +56,6 @@ public abstract class EsAbstractConditionBean implements ConditionBean {
     // ===================================================================================
     //                                                                             Builder
     //                                                                             =======
-    public abstract CountRequestBuilder build(CountRequestBuilder builder);
-
     public abstract SearchRequestBuilder build(SearchRequestBuilder builder);
 
     // ===================================================================================

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

@@ -476,6 +476,6 @@ public abstract class EsAbstractConditionQuery implements ConditionQuery {
     @FunctionalInterface
     public interface OperatorCall<CQ extends EsAbstractConditionQuery> {
 
-        void callback(CQ and);
+        void callback(CQ query);
     }
 }

src/main/java/org/codelibs/fess/es/config/cbean/bs/BsBadWordCB.java

@@ -25,7 +25,6 @@ import org.codelibs.fess.es.config.cbean.BadWordCB;
 import org.codelibs.fess.es.config.cbean.cq.BadWordCQ;
 import org.codelibs.fess.es.config.cbean.cq.bs.BsBadWordCQ;
 import org.dbflute.cbean.ConditionQuery;
-import org.elasticsearch.action.count.CountRequestBuilder;
 import org.elasticsearch.action.search.SearchRequestBuilder;
 import org.elasticsearch.index.query.QueryBuilder;
 
@@ -81,16 +80,6 @@ public class BsBadWordCB extends EsAbstractConditionBean {
     // ===================================================================================
     //                                                                               Build
     //                                                                               =====
-    @Override
-    public CountRequestBuilder build(CountRequestBuilder builder) {
-        if (_conditionQuery != null) {
-            QueryBuilder queryBuilder = _conditionQuery.getQuery();
-            if (queryBuilder != null) {
-                builder.setQuery(queryBuilder);
-            }
-        }
-        return builder;
-    }
 
     @Override
     public SearchRequestBuilder build(SearchRequestBuilder builder) {

src/main/java/org/codelibs/fess/es/config/cbean/bs/BsBoostDocumentRuleCB.java

@@ -25,7 +25,6 @@ import org.codelibs.fess.es.config.cbean.BoostDocumentRuleCB;
 import org.codelibs.fess.es.config.cbean.cq.BoostDocumentRuleCQ;
 import org.codelibs.fess.es.config.cbean.cq.bs.BsBoostDocumentRuleCQ;
 import org.dbflute.cbean.ConditionQuery;
-import org.elasticsearch.action.count.CountRequestBuilder;
 import org.elasticsearch.action.search.SearchRequestBuilder;
 import org.elasticsearch.index.query.QueryBuilder;
 
@@ -81,16 +80,6 @@ public class BsBoostDocumentRuleCB extends EsAbstractConditionBean {
     // ===================================================================================
     //                                                                               Build
     //                                                                               =====
-    @Override
-    public CountRequestBuilder build(CountRequestBuilder builder) {
-        if (_conditionQuery != null) {
-            QueryBuilder queryBuilder = _conditionQuery.getQuery();
-            if (queryBuilder != null) {
-                builder.setQuery(queryBuilder);
-            }
-        }
-        return builder;
-    }
 
     @Override
     public SearchRequestBuilder build(SearchRequestBuilder builder) {

src/main/java/org/codelibs/fess/es/config/cbean/bs/BsCrawlingInfoCB.java

@@ -25,7 +25,6 @@ import org.codelibs.fess.es.config.cbean.CrawlingInfoCB;
 import org.codelibs.fess.es.config.cbean.cq.CrawlingInfoCQ;
 import org.codelibs.fess.es.config.cbean.cq.bs.BsCrawlingInfoCQ;
 import org.dbflute.cbean.ConditionQuery;
-import org.elasticsearch.action.count.CountRequestBuilder;
 import org.elasticsearch.action.search.SearchRequestBuilder;
 import org.elasticsearch.index.query.QueryBuilder;
 
@@ -81,16 +80,6 @@ public class BsCrawlingInfoCB extends EsAbstractConditionBean {
     // ===================================================================================
     //                                                                               Build
     //                                                                               =====
-    @Override
-    public CountRequestBuilder build(CountRequestBuilder builder) {
-        if (_conditionQuery != null) {
-            QueryBuilder queryBuilder = _conditionQuery.getQuery();
-            if (queryBuilder != null) {
-                builder.setQuery(queryBuilder);
-            }
-        }
-        return builder;
-    }
 
     @Override
     public SearchRequestBuilder build(SearchRequestBuilder builder) {

src/main/java/org/codelibs/fess/es/config/cbean/bs/BsCrawlingInfoParamCB.java

@@ -25,7 +25,6 @@ import org.codelibs.fess.es.config.cbean.CrawlingInfoParamCB;
 import org.codelibs.fess.es.config.cbean.cq.CrawlingInfoParamCQ;
 import org.codelibs.fess.es.config.cbean.cq.bs.BsCrawlingInfoParamCQ;
 import org.dbflute.cbean.ConditionQuery;
-import org.elasticsearch.action.count.CountRequestBuilder;
 import org.elasticsearch.action.search.SearchRequestBuilder;
 import org.elasticsearch.index.query.QueryBuilder;
 
@@ -81,16 +80,6 @@ public class BsCrawlingInfoParamCB extends EsAbstractConditionBean {
     // ===================================================================================
     //                                                                               Build
     //                                                                               =====
-    @Override
-    public CountRequestBuilder build(CountRequestBuilder builder) {
-        if (_conditionQuery != null) {
-            QueryBuilder queryBuilder = _conditionQuery.getQuery();
-            if (queryBuilder != null) {
-                builder.setQuery(queryBuilder);
-            }
-        }
-        return builder;
-    }
 
     @Override
     public SearchRequestBuilder build(SearchRequestBuilder builder) {

src/main/java/org/codelibs/fess/es/config/cbean/bs/BsDataConfigCB.java

@@ -25,7 +25,6 @@ import org.codelibs.fess.es.config.cbean.DataConfigCB;
 import org.codelibs.fess.es.config.cbean.cq.DataConfigCQ;
 import org.codelibs.fess.es.config.cbean.cq.bs.BsDataConfigCQ;
 import org.dbflute.cbean.ConditionQuery;
-import org.elasticsearch.action.count.CountRequestBuilder;
 import org.elasticsearch.action.search.SearchRequestBuilder;
 import org.elasticsearch.index.query.QueryBuilder;
 
@@ -81,16 +80,6 @@ public class BsDataConfigCB extends EsAbstractConditionBean {
     // ===================================================================================
     //                                                                               Build
     //                                                                               =====
-    @Override
-    public CountRequestBuilder build(CountRequestBuilder builder) {
-        if (_conditionQuery != null) {
-            QueryBuilder queryBuilder = _conditionQuery.getQuery();
-            if (queryBuilder != null) {
-                builder.setQuery(queryBuilder);
-            }
-        }
-        return builder;
-    }
 
     @Override
     public SearchRequestBuilder build(SearchRequestBuilder builder) {

src/main/java/org/codelibs/fess/es/config/cbean/bs/BsDataConfigToLabelCB.java

@@ -25,7 +25,6 @@ import org.codelibs.fess.es.config.cbean.DataConfigToLabelCB;
 import org.codelibs.fess.es.config.cbean.cq.DataConfigToLabelCQ;
 import org.codelibs.fess.es.config.cbean.cq.bs.BsDataConfigToLabelCQ;
 import org.dbflute.cbean.ConditionQuery;
-import org.elasticsearch.action.count.CountRequestBuilder;
 import org.elasticsearch.action.search.SearchRequestBuilder;
 import org.elasticsearch.index.query.QueryBuilder;
 
@@ -81,16 +80,6 @@ public class BsDataConfigToLabelCB extends EsAbstractConditionBean {
     // ===================================================================================
     //                                                                               Build
     //                                                                               =====
-    @Override
-    public CountRequestBuilder build(CountRequestBuilder builder) {
-        if (_conditionQuery != null) {
-            QueryBuilder queryBuilder = _conditionQuery.getQuery();
-            if (queryBuilder != null) {
-                builder.setQuery(queryBuilder);
-            }
-        }
-        return builder;
-    }
 
     @Override
     public SearchRequestBuilder build(SearchRequestBuilder builder) {

src/main/java/org/codelibs/fess/es/config/cbean/bs/BsDataConfigToRoleCB.java

@@ -25,7 +25,6 @@ import org.codelibs.fess.es.config.cbean.DataConfigToRoleCB;
 import org.codelibs.fess.es.config.cbean.cq.DataConfigToRoleCQ;
 import org.codelibs.fess.es.config.cbean.cq.bs.BsDataConfigToRoleCQ;
 import org.dbflute.cbean.ConditionQuery;
-import org.elasticsearch.action.count.CountRequestBuilder;
 import org.elasticsearch.action.search.SearchRequestBuilder;
 import org.elasticsearch.index.query.QueryBuilder;
 
@@ -81,16 +80,6 @@ public class BsDataConfigToRoleCB extends EsAbstractConditionBean {
     // ===================================================================================
     //                                                                               Build
     //                                                                               =====
-    @Override
-    public CountRequestBuilder build(CountRequestBuilder builder) {
-        if (_conditionQuery != null) {
-            QueryBuilder queryBuilder = _conditionQuery.getQuery();
-            if (queryBuilder != null) {
-                builder.setQuery(queryBuilder);
-            }
-        }
-        return builder;
-    }
 
     @Override
     public SearchRequestBuilder build(SearchRequestBuilder builder) {

src/main/java/org/codelibs/fess/es/config/cbean/bs/BsDuplicateHostCB.java

@@ -25,7 +25,6 @@ import org.codelibs.fess.es.config.cbean.DuplicateHostCB;
 import org.codelibs.fess.es.config.cbean.cq.DuplicateHostCQ;
 import org.codelibs.fess.es.config.cbean.cq.bs.BsDuplicateHostCQ;
 import org.dbflute.cbean.ConditionQuery;
-import org.elasticsearch.action.count.CountRequestBuilder;
 import org.elasticsearch.action.search.SearchRequestBuilder;
 import org.elasticsearch.index.query.QueryBuilder;
 
@@ -81,16 +80,6 @@ public class BsDuplicateHostCB extends EsAbstractConditionBean {
     // ===================================================================================
     //                                                                               Build
     //                                                                               =====
-    @Override
-    public CountRequestBuilder build(CountRequestBuilder builder) {
-        if (_conditionQuery != null) {
-            QueryBuilder queryBuilder = _conditionQuery.getQuery();
-            if (queryBuilder != null) {
-                builder.setQuery(queryBuilder);
-            }
-        }
-        return builder;
-    }
 
     @Override
     public SearchRequestBuilder build(SearchRequestBuilder builder) {

src/main/java/org/codelibs/fess/es/config/cbean/bs/BsElevateWordCB.java

@@ -25,7 +25,6 @@ import org.codelibs.fess.es.config.cbean.ElevateWordCB;
 import org.codelibs.fess.es.config.cbean.cq.ElevateWordCQ;
 import org.codelibs.fess.es.config.cbean.cq.bs.BsElevateWordCQ;
 import org.dbflute.cbean.ConditionQuery;
-import org.elasticsearch.action.count.CountRequestBuilder;
 import org.elasticsearch.action.search.SearchRequestBuilder;
 import org.elasticsearch.index.query.QueryBuilder;
 
@@ -81,16 +80,6 @@ public class BsElevateWordCB extends EsAbstractConditionBean {
     // ===================================================================================
     //                                                                               Build
     //                                                                               =====
-    @Override
-    public CountRequestBuilder build(CountRequestBuilder builder) {
-        if (_conditionQuery != null) {
-            QueryBuilder queryBuilder = _conditionQuery.getQuery();
-            if (queryBuilder != null) {
-                builder.setQuery(queryBuilder);
-            }
-        }
-        return builder;
-    }
 
     @Override
     public SearchRequestBuilder build(SearchRequestBuilder builder) {

src/main/java/org/codelibs/fess/es/config/cbean/bs/BsElevateWordToLabelCB.java

@@ -25,7 +25,6 @@ import org.codelibs.fess.es.config.cbean.ElevateWordToLabelCB;
 import org.codelibs.fess.es.config.cbean.cq.ElevateWordToLabelCQ;
 import org.codelibs.fess.es.config.cbean.cq.bs.BsElevateWordToLabelCQ;
 import org.dbflute.cbean.ConditionQuery;
-import org.elasticsearch.action.count.CountRequestBuilder;
 import org.elasticsearch.action.search.SearchRequestBuilder;
 import org.elasticsearch.index.query.QueryBuilder;
 
@@ -81,16 +80,6 @@ public class BsElevateWordToLabelCB extends EsAbstractConditionBean {
     // ===================================================================================
     //                                                                               Build
     //                                                                               =====
-    @Override
-    public CountRequestBuilder build(CountRequestBuilder builder) {
-        if (_conditionQuery != null) {
-            QueryBuilder queryBuilder = _conditionQuery.getQuery();
-            if (queryBuilder != null) {
-                builder.setQuery(queryBuilder);
-            }
-        }
-        return builder;
-    }
 
     @Override
     public SearchRequestBuilder build(SearchRequestBuilder builder) {

src/main/java/org/codelibs/fess/es/config/cbean/bs/BsFailureUrlCB.java

@@ -25,7 +25,6 @@ import org.codelibs.fess.es.config.cbean.FailureUrlCB;
 import org.codelibs.fess.es.config.cbean.cq.FailureUrlCQ;
 import org.codelibs.fess.es.config.cbean.cq.bs.BsFailureUrlCQ;
 import org.dbflute.cbean.ConditionQuery;
-import org.elasticsearch.action.count.CountRequestBuilder;
 import org.elasticsearch.action.search.SearchRequestBuilder;
 import org.elasticsearch.index.query.QueryBuilder;
 
@@ -81,16 +80,6 @@ public class BsFailureUrlCB extends EsAbstractConditionBean {
     // ===================================================================================
     //                                                                               Build
     //                                                                               =====
-    @Override
-    public CountRequestBuilder build(CountRequestBuilder builder) {
-        if (_conditionQuery != null) {
-            QueryBuilder queryBuilder = _conditionQuery.getQuery();
-            if (queryBuilder != null) {
-                builder.setQuery(queryBuilder);
-            }
-        }
-        return builder;
-    }
 
     @Override
     public SearchRequestBuilder build(SearchRequestBuilder builder) {

src/main/java/org/codelibs/fess/es/config/cbean/bs/BsFileAuthenticationCB.java

@@ -25,7 +25,6 @@ import org.codelibs.fess.es.config.cbean.FileAuthenticationCB;
 import org.codelibs.fess.es.config.cbean.cq.FileAuthenticationCQ;
 import org.codelibs.fess.es.config.cbean.cq.bs.BsFileAuthenticationCQ;
 import org.dbflute.cbean.ConditionQuery;
-import org.elasticsearch.action.count.CountRequestBuilder;
 import org.elasticsearch.action.search.SearchRequestBuilder;
 import org.elasticsearch.index.query.QueryBuilder;
 
@@ -81,16 +80,6 @@ public class BsFileAuthenticationCB extends EsAbstractConditionBean {
     // ===================================================================================
     //                                                                               Build
     //                                                                               =====
-    @Override
-    public CountRequestBuilder build(CountRequestBuilder builder) {
-        if (_conditionQuery != null) {
-            QueryBuilder queryBuilder = _conditionQuery.getQuery();
-            if (queryBuilder != null) {
-                builder.setQuery(queryBuilder);
-            }
-        }
-        return builder;
-    }
 
     @Override
     public SearchRequestBuilder build(SearchRequestBuilder builder) {

src/main/java/org/codelibs/fess/es/config/cbean/bs/BsFileConfigCB.java

@@ -25,7 +25,6 @@ import org.codelibs.fess.es.config.cbean.FileConfigCB;
 import org.codelibs.fess.es.config.cbean.cq.FileConfigCQ;
 import org.codelibs.fess.es.config.cbean.cq.bs.BsFileConfigCQ;
 import org.dbflute.cbean.ConditionQuery;
-import org.elasticsearch.action.count.CountRequestBuilder;
 import org.elasticsearch.action.search.SearchRequestBuilder;
 import org.elasticsearch.index.query.QueryBuilder;
 
@@ -81,16 +80,6 @@ public class BsFileConfigCB extends EsAbstractConditionBean {
     // ===================================================================================
     //                                                                               Build
     //                                                                               =====
-    @Override
-    public CountRequestBuilder build(CountRequestBuilder builder) {
-        if (_conditionQuery != null) {
-            QueryBuilder queryBuilder = _conditionQuery.getQuery();
-            if (queryBuilder != null) {
-                builder.setQuery(queryBuilder);
-            }
-        }
-        return builder;
-    }
 
     @Override
     public SearchRequestBuilder build(SearchRequestBuilder builder) {

src/main/java/org/codelibs/fess/es/config/cbean/bs/BsFileConfigToLabelCB.java

@@ -25,7 +25,6 @@ import org.codelibs.fess.es.config.cbean.FileConfigToLabelCB;
 import org.codelibs.fess.es.config.cbean.cq.FileConfigToLabelCQ;
 import org.codelibs.fess.es.config.cbean.cq.bs.BsFileConfigToLabelCQ;
 import org.dbflute.cbean.ConditionQuery;
-import org.elasticsearch.action.count.CountRequestBuilder;
 import org.elasticsearch.action.search.SearchRequestBuilder;
 import org.elasticsearch.index.query.QueryBuilder;
 
@@ -81,16 +80,6 @@ public class BsFileConfigToLabelCB extends EsAbstractConditionBean {
     // ===================================================================================
     //                                                                               Build
     //                                                                               =====
-    @Override
-    public CountRequestBuilder build(CountRequestBuilder builder) {
-        if (_conditionQuery != null) {
-            QueryBuilder queryBuilder = _conditionQuery.getQuery();
-            if (queryBuilder != null) {
-                builder.setQuery(queryBuilder);
-            }
-        }
-        return builder;
-    }
 
     @Override
     public SearchRequestBuilder build(SearchRequestBuilder builder) {

src/main/java/org/codelibs/fess/es/config/cbean/bs/BsFileConfigToRoleCB.java

@@ -25,7 +25,6 @@ import org.codelibs.fess.es.config.cbean.FileConfigToRoleCB;
 import org.codelibs.fess.es.config.cbean.cq.FileConfigToRoleCQ;
 import org.codelibs.fess.es.config.cbean.cq.bs.BsFileConfigToRoleCQ;
 import org.dbflute.cbean.ConditionQuery;
-import org.elasticsearch.action.count.CountRequestBuilder;
 import org.elasticsearch.action.search.SearchRequestBuilder;
 import org.elasticsearch.index.query.QueryBuilder;
 
@@ -81,16 +80,6 @@ public class BsFileConfigToRoleCB extends EsAbstractConditionBean {
     // ===================================================================================
     //                                                                               Build
     //                                                                               =====
-    @Override
-    public CountRequestBuilder build(CountRequestBuilder builder) {
-        if (_conditionQuery != null) {
-            QueryBuilder queryBuilder = _conditionQuery.getQuery();
-            if (queryBuilder != null) {
-                builder.setQuery(queryBuilder);
-            }
-        }
-        return builder;
-    }
 
     @Override
     public SearchRequestBuilder build(SearchRequestBuilder builder) {

src/main/java/org/codelibs/fess/es/config/cbean/bs/BsJobLogCB.java

@@ -25,7 +25,6 @@ import org.codelibs.fess.es.config.cbean.JobLogCB;
 import org.codelibs.fess.es.config.cbean.cq.JobLogCQ;
 import org.codelibs.fess.es.config.cbean.cq.bs.BsJobLogCQ;
 import org.dbflute.cbean.ConditionQuery;
-import org.elasticsearch.action.count.CountRequestBuilder;
 import org.elasticsearch.action.search.SearchRequestBuilder;
 import org.elasticsearch.index.query.QueryBuilder;
 
@@ -81,16 +80,6 @@ public class BsJobLogCB extends EsAbstractConditionBean {
     // ===================================================================================
     //                                                                               Build
     //                                                                               =====
-    @Override
-    public CountRequestBuilder build(CountRequestBuilder builder) {
-        if (_conditionQuery != null) {
-            QueryBuilder queryBuilder = _conditionQuery.getQuery();
-            if (queryBuilder != null) {
-                builder.setQuery(queryBuilder);
-            }
-        }
-        return builder;
-    }
 
     @Override
     public SearchRequestBuilder build(SearchRequestBuilder builder) {

src/main/java/org/codelibs/fess/es/config/cbean/bs/BsKeyMatchCB.java

@@ -25,7 +25,6 @@ import org.codelibs.fess.es.config.cbean.KeyMatchCB;
 import org.codelibs.fess.es.config.cbean.cq.KeyMatchCQ;
 import org.codelibs.fess.es.config.cbean.cq.bs.BsKeyMatchCQ;
 import org.dbflute.cbean.ConditionQuery;
-import org.elasticsearch.action.count.CountRequestBuilder;
 import org.elasticsearch.action.search.SearchRequestBuilder;
 import org.elasticsearch.index.query.QueryBuilder;
 
@@ -81,16 +80,6 @@ public class BsKeyMatchCB extends EsAbstractConditionBean {
     // ===================================================================================
     //                                                                               Build
     //                                                                               =====
-    @Override
-    public CountRequestBuilder build(CountRequestBuilder builder) {
-        if (_conditionQuery != null) {
-            QueryBuilder queryBuilder = _conditionQuery.getQuery();
-            if (queryBuilder != null) {
-                builder.setQuery(queryBuilder);
-            }
-        }
-        return builder;
-    }
 
     @Override
     public SearchRequestBuilder build(SearchRequestBuilder builder) {

src/main/java/org/codelibs/fess/es/config/cbean/bs/BsLabelToRoleCB.java

@@ -25,7 +25,6 @@ import org.codelibs.fess.es.config.cbean.LabelToRoleCB;
 import org.codelibs.fess.es.config.cbean.cq.LabelToRoleCQ;
 import org.codelibs.fess.es.config.cbean.cq.bs.BsLabelToRoleCQ;
 import org.dbflute.cbean.ConditionQuery;
-import org.elasticsearch.action.count.CountRequestBuilder;
 import org.elasticsearch.action.search.SearchRequestBuilder;
 import org.elasticsearch.index.query.QueryBuilder;
 
@@ -81,16 +80,6 @@ public class BsLabelToRoleCB extends EsAbstractConditionBean {
     // ===================================================================================
     //                                                                               Build
     //                                                                               =====
-    @Override
-    public CountRequestBuilder build(CountRequestBuilder builder) {
-        if (_conditionQuery != null) {
-            QueryBuilder queryBuilder = _conditionQuery.getQuery();
-            if (queryBuilder != null) {
-                builder.setQuery(queryBuilder);
-            }
-        }
-        return builder;
-    }
 
     @Override
     public SearchRequestBuilder build(SearchRequestBuilder builder) {

src/main/java/org/codelibs/fess/es/config/cbean/bs/BsLabelTypeCB.java

@@ -25,7 +25,6 @@ import org.codelibs.fess.es.config.cbean.LabelTypeCB;
 import org.codelibs.fess.es.config.cbean.cq.LabelTypeCQ;
 import org.codelibs.fess.es.config.cbean.cq.bs.BsLabelTypeCQ;
 import org.dbflute.cbean.ConditionQuery;
-import org.elasticsearch.action.count.CountRequestBuilder;
 import org.elasticsearch.action.search.SearchRequestBuilder;
 import org.elasticsearch.index.query.QueryBuilder;
 
@@ -81,16 +80,6 @@ public class BsLabelTypeCB extends EsAbstractConditionBean {
     // ===================================================================================
     //                                                                               Build
     //                                                                               =====
-    @Override
-    public CountRequestBuilder build(CountRequestBuilder builder) {
-        if (_conditionQuery != null) {
-            QueryBuilder queryBuilder = _conditionQuery.getQuery();
-            if (queryBuilder != null) {
-                builder.setQuery(queryBuilder);
-            }
-        }
-        return builder;
-    }
 
     @Override
     public SearchRequestBuilder build(SearchRequestBuilder builder) {

src/main/java/org/codelibs/fess/es/config/cbean/bs/BsPathMappingCB.java

@@ -25,7 +25,6 @@ import org.codelibs.fess.es.config.cbean.PathMappingCB;
 import org.codelibs.fess.es.config.cbean.cq.PathMappingCQ;
 import org.codelibs.fess.es.config.cbean.cq.bs.BsPathMappingCQ;
 import org.dbflute.cbean.ConditionQuery;
-import org.elasticsearch.action.count.CountRequestBuilder;
 import org.elasticsearch.action.search.SearchRequestBuilder;
 import org.elasticsearch.index.query.QueryBuilder;
 
@@ -81,16 +80,6 @@ public class BsPathMappingCB extends EsAbstractConditionBean {
     // ===================================================================================
     //                                                                               Build
     //                                                                               =====
-    @Override
-    public CountRequestBuilder build(CountRequestBuilder builder) {
-        if (_conditionQuery != null) {
-            QueryBuilder queryBuilder = _conditionQuery.getQuery();
-            if (queryBuilder != null) {
-                builder.setQuery(queryBuilder);
-            }
-        }
-        return builder;
-    }
 
     @Override
     public SearchRequestBuilder build(SearchRequestBuilder builder) {

src/main/java/org/codelibs/fess/es/config/cbean/bs/BsRequestHeaderCB.java

@@ -25,7 +25,6 @@ import org.codelibs.fess.es.config.cbean.RequestHeaderCB;
 import org.codelibs.fess.es.config.cbean.cq.RequestHeaderCQ;
 import org.codelibs.fess.es.config.cbean.cq.bs.BsRequestHeaderCQ;
 import org.dbflute.cbean.ConditionQuery;
-import org.elasticsearch.action.count.CountRequestBuilder;
 import org.elasticsearch.action.search.SearchRequestBuilder;
 import org.elasticsearch.index.query.QueryBuilder;
 
@@ -81,16 +80,6 @@ public class BsRequestHeaderCB extends EsAbstractConditionBean {
     // ===================================================================================
     //                                                                               Build
     //                                                                               =====
-    @Override
-    public CountRequestBuilder build(CountRequestBuilder builder) {
-        if (_conditionQuery != null) {
-            QueryBuilder queryBuilder = _conditionQuery.getQuery();
-            if (queryBuilder != null) {
-                builder.setQuery(queryBuilder);
-            }
-        }
-        return builder;
-    }
 
     @Override
     public SearchRequestBuilder build(SearchRequestBuilder builder) {

src/main/java/org/codelibs/fess/es/config/cbean/bs/BsRoleTypeCB.java

@@ -25,7 +25,6 @@ import org.codelibs.fess.es.config.cbean.RoleTypeCB;
 import org.codelibs.fess.es.config.cbean.cq.RoleTypeCQ;
 import org.codelibs.fess.es.config.cbean.cq.bs.BsRoleTypeCQ;
 import org.dbflute.cbean.ConditionQuery;
-import org.elasticsearch.action.count.CountRequestBuilder;
 import org.elasticsearch.action.search.SearchRequestBuilder;
 import org.elasticsearch.index.query.QueryBuilder;
 
@@ -81,16 +80,6 @@ public class BsRoleTypeCB extends EsAbstractConditionBean {
     // ===================================================================================
     //                                                                               Build
     //                                                                               =====
-    @Override
-    public CountRequestBuilder build(CountRequestBuilder builder) {
-        if (_conditionQuery != null) {
-            QueryBuilder queryBuilder = _conditionQuery.getQuery();
-            if (queryBuilder != null) {
-                builder.setQuery(queryBuilder);
-            }
-        }
-        return builder;
-    }
 
     @Override
     public SearchRequestBuilder build(SearchRequestBuilder builder) {

src/main/java/org/codelibs/fess/es/config/cbean/bs/BsScheduledJobCB.java

@@ -25,7 +25,6 @@ import org.codelibs.fess.es.config.cbean.ScheduledJobCB;
 import org.codelibs.fess.es.config.cbean.cq.ScheduledJobCQ;
 import org.codelibs.fess.es.config.cbean.cq.bs.BsScheduledJobCQ;
 import org.dbflute.cbean.ConditionQuery;
-import org.elasticsearch.action.count.CountRequestBuilder;
 import org.elasticsearch.action.search.SearchRequestBuilder;
 import org.elasticsearch.index.query.QueryBuilder;
 
@@ -81,16 +80,6 @@ public class BsScheduledJobCB extends EsAbstractConditionBean {
     // ===================================================================================
     //                                                                               Build
     //                                                                               =====
-    @Override
-    public CountRequestBuilder build(CountRequestBuilder builder) {
-        if (_conditionQuery != null) {
-            QueryBuilder queryBuilder = _conditionQuery.getQuery();
-            if (queryBuilder != null) {
-                builder.setQuery(queryBuilder);
-            }
-        }
-        return builder;
-    }
 
     @Override
     public SearchRequestBuilder build(SearchRequestBuilder builder) {

src/main/java/org/codelibs/fess/es/config/cbean/bs/BsWebAuthenticationCB.java

@@ -25,7 +25,6 @@ import org.codelibs.fess.es.config.cbean.WebAuthenticationCB;
 import org.codelibs.fess.es.config.cbean.cq.WebAuthenticationCQ;
 import org.codelibs.fess.es.config.cbean.cq.bs.BsWebAuthenticationCQ;
 import org.dbflute.cbean.ConditionQuery;
-import org.elasticsearch.action.count.CountRequestBuilder;
 import org.elasticsearch.action.search.SearchRequestBuilder;
 import org.elasticsearch.index.query.QueryBuilder;
 
@@ -81,16 +80,6 @@ public class BsWebAuthenticationCB extends EsAbstractConditionBean {
     // ===================================================================================
     //                                                                               Build
     //                                                                               =====
-    @Override
-    public CountRequestBuilder build(CountRequestBuilder builder) {
-        if (_conditionQuery != null) {
-            QueryBuilder queryBuilder = _conditionQuery.getQuery();
-            if (queryBuilder != null) {
-                builder.setQuery(queryBuilder);
-            }
-        }
-        return builder;
-    }
 
     @Override
     public SearchRequestBuilder build(SearchRequestBuilder builder) {

src/main/java/org/codelibs/fess/es/config/cbean/bs/BsWebConfigCB.java

@@ -25,7 +25,6 @@ import org.codelibs.fess.es.config.cbean.WebConfigCB;
 import org.codelibs.fess.es.config.cbean.cq.WebConfigCQ;
 import org.codelibs.fess.es.config.cbean.cq.bs.BsWebConfigCQ;
 import org.dbflute.cbean.ConditionQuery;
-import org.elasticsearch.action.count.CountRequestBuilder;
 import org.elasticsearch.action.search.SearchRequestBuilder;
 import org.elasticsearch.index.query.QueryBuilder;
 
@@ -81,16 +80,6 @@ public class BsWebConfigCB extends EsAbstractConditionBean {
     // ===================================================================================
     //                                                                               Build
     //                                                                               =====
-    @Override
-    public CountRequestBuilder build(CountRequestBuilder builder) {
-        if (_conditionQuery != null) {
-            QueryBuilder queryBuilder = _conditionQuery.getQuery();
-            if (queryBuilder != null) {
-                builder.setQuery(queryBuilder);
-            }
-        }
-        return builder;
-    }
 
     @Override
     public SearchRequestBuilder build(SearchRequestBuilder builder) {

src/main/java/org/codelibs/fess/es/config/cbean/bs/BsWebConfigToLabelCB.java

@@ -25,7 +25,6 @@ import org.codelibs.fess.es.config.cbean.WebConfigToLabelCB;
 import org.codelibs.fess.es.config.cbean.cq.WebConfigToLabelCQ;
 import org.codelibs.fess.es.config.cbean.cq.bs.BsWebConfigToLabelCQ;
 import org.dbflute.cbean.ConditionQuery;
-import org.elasticsearch.action.count.CountRequestBuilder;
 import org.elasticsearch.action.search.SearchRequestBuilder;
 import org.elasticsearch.index.query.QueryBuilder;
 
@@ -81,16 +80,6 @@ public class BsWebConfigToLabelCB extends EsAbstractConditionBean {
     // ===================================================================================
     //                                                                               Build
     //                                                                               =====
-    @Override
-    public CountRequestBuilder build(CountRequestBuilder builder) {
-        if (_conditionQuery != null) {
-            QueryBuilder queryBuilder = _conditionQuery.getQuery();
-            if (queryBuilder != null) {
-                builder.setQuery(queryBuilder);
-            }
-        }
-        return builder;
-    }
 
     @Override
     public SearchRequestBuilder build(SearchRequestBuilder builder) {

src/main/java/org/codelibs/fess/es/config/cbean/bs/BsWebConfigToRoleCB.java

@@ -25,7 +25,6 @@ import org.codelibs.fess.es.config.cbean.WebConfigToRoleCB;
 import org.codelibs.fess.es.config.cbean.cq.WebConfigToRoleCQ;
 import org.codelibs.fess.es.config.cbean.cq.bs.BsWebConfigToRoleCQ;
 import org.dbflute.cbean.ConditionQuery;
-import org.elasticsearch.action.count.CountRequestBuilder;
 import org.elasticsearch.action.search.SearchRequestBuilder;
 import org.elasticsearch.index.query.QueryBuilder;
 
@@ -81,16 +80,6 @@ public class BsWebConfigToRoleCB extends EsAbstractConditionBean {
     // ===================================================================================
     //                                                                               Build
     //                                                                               =====
-    @Override
-    public CountRequestBuilder build(CountRequestBuilder builder) {
-        if (_conditionQuery != null) {
-            QueryBuilder queryBuilder = _conditionQuery.getQuery();
-            if (queryBuilder != null) {
-                builder.setQuery(queryBuilder);
-            }
-        }
-        return builder;
-    }
 
     @Override
     public SearchRequestBuilder build(SearchRequestBuilder builder) {

src/main/java/org/codelibs/fess/es/config/cbean/cq/bs/BsBadWordCQ.java

@@ -21,14 +21,11 @@ import java.util.Collection;
 import org.codelibs.fess.es.config.allcommon.EsAbstractConditionQuery;
 import org.codelibs.fess.es.config.cbean.cq.BadWordCQ;
 import org.dbflute.cbean.ckey.ConditionKey;
-import org.dbflute.exception.IllegalConditionBeanOperationException;
 import org.elasticsearch.index.query.BoolQueryBuilder;
 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;
@@ -70,19 +67,8 @@ public abstract class BsBadWordCQ extends EsAbstractConditionQuery {
         not(notLambda, null);
     }
 
-    public void not(OperatorCall<BadWordCQ> notLambda, ConditionOptionCall<NotQueryBuilder> opLambda) {
-        BadWordCQ notQuery = new BadWordCQ();
-        notLambda.callback(notQuery);
-        if (notQuery.hasQueries()) {
-            if (notQuery.getQueryBuilderList().size() > 1) {
-                final String msg = "not query must be one query.";
-                throw new IllegalConditionBeanOperationException(msg);
-            }
-            NotQueryBuilder builder = QueryBuilders.notQuery(notQuery.getQueryBuilderList().get(0));
-            if (opLambda != null) {
-                opLambda.callback(builder);
-            }
-        }
+    public void not(final OperatorCall<BadWordCQ> notLambda, final ConditionOptionCall<BoolQueryBuilder> opLambda) {
+        bool((must, should, mustNot, filter) -> notLambda.callback(mustNot), opLambda);
     }
 
     public void bool(BoolCall<BadWordCQ> boolLambda) {
@@ -131,19 +117,16 @@ public abstract class BsBadWordCQ extends EsAbstractConditionQuery {
         setId_NotTerm(id, null);
     }
 
-    public void setId_NotEqual(String id, ConditionOptionCall<NotQueryBuilder> opLambda) {
-        setId_NotTerm(id, opLambda);
-    }
-
     public void setId_NotTerm(String id) {
         setId_NotTerm(id, null);
     }
 
-    public void setId_NotTerm(String id, ConditionOptionCall<NotQueryBuilder> opLambda) {
-        NotQueryBuilder builder = QueryBuilders.notQuery(regTermQ("_id", id));
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
+    public void setId_NotEqual(String id, ConditionOptionCall<BoolQueryBuilder> opLambda) {
+        setId_NotTerm(id, opLambda);
+    }
+
+    public void setId_NotTerm(String id, ConditionOptionCall<BoolQueryBuilder> opLambda) {
+        not(not -> not.setId_Term(id), opLambda);
     }
 
     public void setId_Terms(Collection<String> idList) {
@@ -198,19 +181,16 @@ public abstract class BsBadWordCQ extends EsAbstractConditionQuery {
         setCreatedBy_NotTerm(createdBy, null);
     }
 
-    public void setCreatedBy_NotEqual(String createdBy, ConditionOptionCall<NotQueryBuilder> opLambda) {
-        setCreatedBy_NotTerm(createdBy, opLambda);
-    }
-
     public void setCreatedBy_NotTerm(String createdBy) {
         setCreatedBy_NotTerm(createdBy, null);
     }
 
-    public void setCreatedBy_NotTerm(String createdBy, ConditionOptionCall<NotQueryBuilder> opLambda) {
-        NotQueryBuilder builder = QueryBuilders.notQuery(regTermQ("createdBy", createdBy));
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
+    public void setCreatedBy_NotEqual(String createdBy, ConditionOptionCall<BoolQueryBuilder> opLambda) {
+        setCreatedBy_NotTerm(createdBy, opLambda);
+    }
+
+    public void setCreatedBy_NotTerm(String createdBy, ConditionOptionCall<BoolQueryBuilder> opLambda) {
+        not(not -> not.setCreatedBy_Term(createdBy), opLambda);
     }
 
     public void setCreatedBy_Terms(Collection<String> createdByList) {
@@ -364,19 +344,16 @@ public abstract class BsBadWordCQ extends EsAbstractConditionQuery {
         setCreatedTime_NotTerm(createdTime, null);
     }
 
-    public void setCreatedTime_NotEqual(Long createdTime, ConditionOptionCall<NotQueryBuilder> opLambda) {
-        setCreatedTime_NotTerm(createdTime, opLambda);
-    }
-
     public void setCreatedTime_NotTerm(Long createdTime) {
         setCreatedTime_NotTerm(createdTime, null);
     }
 
-    public void setCreatedTime_NotTerm(Long createdTime, ConditionOptionCall<NotQueryBuilder> opLambda) {
-        NotQueryBuilder builder = QueryBuilders.notQuery(regTermQ("createdTime", createdTime));
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
+    public void setCreatedTime_NotEqual(Long createdTime, ConditionOptionCall<BoolQueryBuilder> opLambda) {
+        setCreatedTime_NotTerm(createdTime, opLambda);
+    }
+
+    public void setCreatedTime_NotTerm(Long createdTime, ConditionOptionCall<BoolQueryBuilder> opLambda) {
+        not(not -> not.setCreatedTime_Term(createdTime), opLambda);
     }
 
     public void setCreatedTime_Terms(Collection<Long> createdTimeList) {
@@ -519,19 +496,16 @@ public abstract class BsBadWordCQ extends EsAbstractConditionQuery {
         setSuggestWord_NotTerm(suggestWord, null);
     }
 
-    public void setSuggestWord_NotEqual(String suggestWord, ConditionOptionCall<NotQueryBuilder> opLambda) {
-        setSuggestWord_NotTerm(suggestWord, opLambda);
-    }
-
     public void setSuggestWord_NotTerm(String suggestWord) {
         setSuggestWord_NotTerm(suggestWord, null);
     }
 
-    public void setSuggestWord_NotTerm(String suggestWord, ConditionOptionCall<NotQueryBuilder> opLambda) {
-        NotQueryBuilder builder = QueryBuilders.notQuery(regTermQ("suggestWord", suggestWord));
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
+    public void setSuggestWord_NotEqual(String suggestWord, ConditionOptionCall<BoolQueryBuilder> opLambda) {
+        setSuggestWord_NotTerm(suggestWord, opLambda);
+    }
+
+    public void setSuggestWord_NotTerm(String suggestWord, ConditionOptionCall<BoolQueryBuilder> opLambda) {
+        not(not -> not.setSuggestWord_Term(suggestWord), opLambda);
     }
 
     public void setSuggestWord_Terms(Collection<String> suggestWordList) {
@@ -685,19 +659,16 @@ public abstract class BsBadWordCQ extends EsAbstractConditionQuery {
         setTargetLabel_NotTerm(targetLabel, null);
     }
 
-    public void setTargetLabel_NotEqual(String targetLabel, ConditionOptionCall<NotQueryBuilder> opLambda) {
-        setTargetLabel_NotTerm(targetLabel, opLambda);
-    }
-
     public void setTargetLabel_NotTerm(String targetLabel) {
         setTargetLabel_NotTerm(targetLabel, null);
     }
 
-    public void setTargetLabel_NotTerm(String targetLabel, ConditionOptionCall<NotQueryBuilder> opLambda) {
-        NotQueryBuilder builder = QueryBuilders.notQuery(regTermQ("targetLabel", targetLabel));
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
+    public void setTargetLabel_NotEqual(String targetLabel, ConditionOptionCall<BoolQueryBuilder> opLambda) {
+        setTargetLabel_NotTerm(targetLabel, opLambda);
+    }
+
+    public void setTargetLabel_NotTerm(String targetLabel, ConditionOptionCall<BoolQueryBuilder> opLambda) {
+        not(not -> not.setTargetLabel_Term(targetLabel), opLambda);
     }
 
     public void setTargetLabel_Terms(Collection<String> targetLabelList) {
@@ -851,19 +822,16 @@ public abstract class BsBadWordCQ extends EsAbstractConditionQuery {
         setTargetRole_NotTerm(targetRole, null);
     }
 
-    public void setTargetRole_NotEqual(String targetRole, ConditionOptionCall<NotQueryBuilder> opLambda) {
-        setTargetRole_NotTerm(targetRole, opLambda);
-    }
-
     public void setTargetRole_NotTerm(String targetRole) {
         setTargetRole_NotTerm(targetRole, null);
     }
 
-    public void setTargetRole_NotTerm(String targetRole, ConditionOptionCall<NotQueryBuilder> opLambda) {
-        NotQueryBuilder builder = QueryBuilders.notQuery(regTermQ("targetRole", targetRole));
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
+    public void setTargetRole_NotEqual(String targetRole, ConditionOptionCall<BoolQueryBuilder> opLambda) {
+        setTargetRole_NotTerm(targetRole, opLambda);
+    }
+
+    public void setTargetRole_NotTerm(String targetRole, ConditionOptionCall<BoolQueryBuilder> opLambda) {
+        not(not -> not.setTargetRole_Term(targetRole), opLambda);
     }
 
     public void setTargetRole_Terms(Collection<String> targetRoleList) {
@@ -1017,19 +985,16 @@ public abstract class BsBadWordCQ extends EsAbstractConditionQuery {
         setUpdatedBy_NotTerm(updatedBy, null);
     }
 
-    public void setUpdatedBy_NotEqual(String updatedBy, ConditionOptionCall<NotQueryBuilder> opLambda) {
-        setUpdatedBy_NotTerm(updatedBy, opLambda);
-    }
-
     public void setUpdatedBy_NotTerm(String updatedBy) {
         setUpdatedBy_NotTerm(updatedBy, null);
     }
 
-    public void setUpdatedBy_NotTerm(String updatedBy, ConditionOptionCall<NotQueryBuilder> opLambda) {
-        NotQueryBuilder builder = QueryBuilders.notQuery(regTermQ("updatedBy", updatedBy));
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
+    public void setUpdatedBy_NotEqual(String updatedBy, ConditionOptionCall<BoolQueryBuilder> opLambda) {
+        setUpdatedBy_NotTerm(updatedBy, opLambda);
+    }
+
+    public void setUpdatedBy_NotTerm(String updatedBy, ConditionOptionCall<BoolQueryBuilder> opLambda) {
+        not(not -> not.setUpdatedBy_Term(updatedBy), opLambda);
     }
 
     public void setUpdatedBy_Terms(Collection<String> updatedByList) {
@@ -1183,19 +1148,16 @@ public abstract class BsBadWordCQ extends EsAbstractConditionQuery {
         setUpdatedTime_NotTerm(updatedTime, null);
     }
 
-    public void setUpdatedTime_NotEqual(Long updatedTime, ConditionOptionCall<NotQueryBuilder> opLambda) {
-        setUpdatedTime_NotTerm(updatedTime, opLambda);
-    }
-
     public void setUpdatedTime_NotTerm(Long updatedTime) {
         setUpdatedTime_NotTerm(updatedTime, null);
     }
 
-    public void setUpdatedTime_NotTerm(Long updatedTime, ConditionOptionCall<NotQueryBuilder> opLambda) {
-        NotQueryBuilder builder = QueryBuilders.notQuery(regTermQ("updatedTime", updatedTime));
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
+    public void setUpdatedTime_NotEqual(Long updatedTime, ConditionOptionCall<BoolQueryBuilder> opLambda) {
+        setUpdatedTime_NotTerm(updatedTime, opLambda);
+    }
+
+    public void setUpdatedTime_NotTerm(Long updatedTime, ConditionOptionCall<BoolQueryBuilder> opLambda) {
+        not(not -> not.setUpdatedTime_Term(updatedTime), opLambda);
     }
 
     public void setUpdatedTime_Terms(Collection<Long> updatedTimeList) {

src/main/java/org/codelibs/fess/es/config/cbean/cq/bs/BsBoostDocumentRuleCQ.java

@@ -21,14 +21,11 @@ import java.util.Collection;
 import org.codelibs.fess.es.config.allcommon.EsAbstractConditionQuery;
 import org.codelibs.fess.es.config.cbean.cq.BoostDocumentRuleCQ;
 import org.dbflute.cbean.ckey.ConditionKey;
-import org.dbflute.exception.IllegalConditionBeanOperationException;
 import org.elasticsearch.index.query.BoolQueryBuilder;
 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;
@@ -71,19 +68,8 @@ public abstract class BsBoostDocumentRuleCQ extends EsAbstractConditionQuery {
         not(notLambda, null);
     }
 
-    public void not(OperatorCall<BoostDocumentRuleCQ> notLambda, ConditionOptionCall<NotQueryBuilder> opLambda) {
-        BoostDocumentRuleCQ notQuery = new BoostDocumentRuleCQ();
-        notLambda.callback(notQuery);
-        if (notQuery.hasQueries()) {
-            if (notQuery.getQueryBuilderList().size() > 1) {
-                final String msg = "not query must be one query.";
-                throw new IllegalConditionBeanOperationException(msg);
-            }
-            NotQueryBuilder builder = QueryBuilders.notQuery(notQuery.getQueryBuilderList().get(0));
-            if (opLambda != null) {
-                opLambda.callback(builder);
-            }
-        }
+    public void not(final OperatorCall<BoostDocumentRuleCQ> notLambda, final ConditionOptionCall<BoolQueryBuilder> opLambda) {
+        bool((must, should, mustNot, filter) -> notLambda.callback(mustNot), opLambda);
     }
 
     public void bool(BoolCall<BoostDocumentRuleCQ> boolLambda) {
@@ -132,19 +118,16 @@ public abstract class BsBoostDocumentRuleCQ extends EsAbstractConditionQuery {
         setId_NotTerm(id, null);
     }
 
-    public void setId_NotEqual(String id, ConditionOptionCall<NotQueryBuilder> opLambda) {
-        setId_NotTerm(id, opLambda);
-    }
-
     public void setId_NotTerm(String id) {
         setId_NotTerm(id, null);
     }
 
-    public void setId_NotTerm(String id, ConditionOptionCall<NotQueryBuilder> opLambda) {
-        NotQueryBuilder builder = QueryBuilders.notQuery(regTermQ("_id", id));
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
+    public void setId_NotEqual(String id, ConditionOptionCall<BoolQueryBuilder> opLambda) {
+        setId_NotTerm(id, opLambda);
+    }
+
+    public void setId_NotTerm(String id, ConditionOptionCall<BoolQueryBuilder> opLambda) {
+        not(not -> not.setId_Term(id), opLambda);
     }
 
     public void setId_Terms(Collection<String> idList) {
@@ -199,19 +182,16 @@ public abstract class BsBoostDocumentRuleCQ extends EsAbstractConditionQuery {
         setBoostExpr_NotTerm(boostExpr, null);
     }
 
-    public void setBoostExpr_NotEqual(String boostExpr, ConditionOptionCall<NotQueryBuilder> opLambda) {
-        setBoostExpr_NotTerm(boostExpr, opLambda);
-    }
-
     public void setBoostExpr_NotTerm(String boostExpr) {
         setBoostExpr_NotTerm(boostExpr, null);
     }
 
-    public void setBoostExpr_NotTerm(String boostExpr, ConditionOptionCall<NotQueryBuilder> opLambda) {
-        NotQueryBuilder builder = QueryBuilders.notQuery(regTermQ("boostExpr", boostExpr));
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
+    public void setBoostExpr_NotEqual(String boostExpr, ConditionOptionCall<BoolQueryBuilder> opLambda) {
+        setBoostExpr_NotTerm(boostExpr, opLambda);
+    }
+
+    public void setBoostExpr_NotTerm(String boostExpr, ConditionOptionCall<BoolQueryBuilder> opLambda) {
+        not(not -> not.setBoostExpr_Term(boostExpr), opLambda);
     }
 
     public void setBoostExpr_Terms(Collection<String> boostExprList) {
@@ -365,19 +345,16 @@ public abstract class BsBoostDocumentRuleCQ extends EsAbstractConditionQuery {
         setCreatedBy_NotTerm(createdBy, null);
     }
 
-    public void setCreatedBy_NotEqual(String createdBy, ConditionOptionCall<NotQueryBuilder> opLambda) {
-        setCreatedBy_NotTerm(createdBy, opLambda);
-    }
-
     public void setCreatedBy_NotTerm(String createdBy) {
         setCreatedBy_NotTerm(createdBy, null);
     }
 
-    public void setCreatedBy_NotTerm(String createdBy, ConditionOptionCall<NotQueryBuilder> opLambda) {
-        NotQueryBuilder builder = QueryBuilders.notQuery(regTermQ("createdBy", createdBy));
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
+    public void setCreatedBy_NotEqual(String createdBy, ConditionOptionCall<BoolQueryBuilder> opLambda) {
+        setCreatedBy_NotTerm(createdBy, opLambda);
+    }
+
+    public void setCreatedBy_NotTerm(String createdBy, ConditionOptionCall<BoolQueryBuilder> opLambda) {
+        not(not -> not.setCreatedBy_Term(createdBy), opLambda);
     }
 
     public void setCreatedBy_Terms(Collection<String> createdByList) {
@@ -531,19 +508,16 @@ public abstract class BsBoostDocumentRuleCQ extends EsAbstractConditionQuery {
         setCreatedTime_NotTerm(createdTime, null);
     }
 
-    public void setCreatedTime_NotEqual(Long createdTime, ConditionOptionCall<NotQueryBuilder> opLambda) {
-        setCreatedTime_NotTerm(createdTime, opLambda);
-    }
-
     public void setCreatedTime_NotTerm(Long createdTime) {
         setCreatedTime_NotTerm(createdTime, null);
     }
 
-    public void setCreatedTime_NotTerm(Long createdTime, ConditionOptionCall<NotQueryBuilder> opLambda) {
-        NotQueryBuilder builder = QueryBuilders.notQuery(regTermQ("createdTime", createdTime));
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
+    public void setCreatedTime_NotEqual(Long createdTime, ConditionOptionCall<BoolQueryBuilder> opLambda) {
+        setCreatedTime_NotTerm(createdTime, opLambda);
+    }
+
+    public void setCreatedTime_NotTerm(Long createdTime, ConditionOptionCall<BoolQueryBuilder> opLambda) {
+        not(not -> not.setCreatedTime_Term(createdTime), opLambda);
     }
 
     public void setCreatedTime_Terms(Collection<Long> createdTimeList) {
@@ -686,19 +660,16 @@ public abstract class BsBoostDocumentRuleCQ extends EsAbstractConditionQuery {
         setSortOrder_NotTerm(sortOrder, null);
     }
 
-    public void setSortOrder_NotEqual(Integer sortOrder, ConditionOptionCall<NotQueryBuilder> opLambda) {
-        setSortOrder_NotTerm(sortOrder, opLambda);
-    }
-
     public void setSortOrder_NotTerm(Integer sortOrder) {
         setSortOrder_NotTerm(sortOrder, null);
     }
 
-    public void setSortOrder_NotTerm(Integer sortOrder, ConditionOptionCall<NotQueryBuilder> opLambda) {
-        NotQueryBuilder builder = QueryBuilders.notQuery(regTermQ("sortOrder", sortOrder));
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
+    public void setSortOrder_NotEqual(Integer sortOrder, ConditionOptionCall<BoolQueryBuilder> opLambda) {
+        setSortOrder_NotTerm(sortOrder, opLambda);
+    }
+
+    public void setSortOrder_NotTerm(Integer sortOrder, ConditionOptionCall<BoolQueryBuilder> opLambda) {
+        not(not -> not.setSortOrder_Term(sortOrder), opLambda);
     }
 
     public void setSortOrder_Terms(Collection<Integer> sortOrderList) {
@@ -841,19 +812,16 @@ public abstract class BsBoostDocumentRuleCQ extends EsAbstractConditionQuery {
         setUpdatedBy_NotTerm(updatedBy, null);
     }
 
-    public void setUpdatedBy_NotEqual(String updatedBy, ConditionOptionCall<NotQueryBuilder> opLambda) {
-        setUpdatedBy_NotTerm(updatedBy, opLambda);
-    }
-
     public void setUpdatedBy_NotTerm(String updatedBy) {
         setUpdatedBy_NotTerm(updatedBy, null);
     }
 
-    public void setUpdatedBy_NotTerm(String updatedBy, ConditionOptionCall<NotQueryBuilder> opLambda) {
-        NotQueryBuilder builder = QueryBuilders.notQuery(regTermQ("updatedBy", updatedBy));
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
+    public void setUpdatedBy_NotEqual(String updatedBy, ConditionOptionCall<BoolQueryBuilder> opLambda) {
+        setUpdatedBy_NotTerm(updatedBy, opLambda);
+    }
+
+    public void setUpdatedBy_NotTerm(String updatedBy, ConditionOptionCall<BoolQueryBuilder> opLambda) {
+        not(not -> not.setUpdatedBy_Term(updatedBy), opLambda);
     }
 
     public void setUpdatedBy_Terms(Collection<String> updatedByList) {
@@ -1007,19 +975,16 @@ public abstract class BsBoostDocumentRuleCQ extends EsAbstractConditionQuery {
         setUpdatedTime_NotTerm(updatedTime, null);
     }
 
-    public void setUpdatedTime_NotEqual(Long updatedTime, ConditionOptionCall<NotQueryBuilder> opLambda) {
-        setUpdatedTime_NotTerm(updatedTime, opLambda);
-    }
-
     public void setUpdatedTime_NotTerm(Long updatedTime) {
         setUpdatedTime_NotTerm(updatedTime, null);
     }
 
-    public void setUpdatedTime_NotTerm(Long updatedTime, ConditionOptionCall<NotQueryBuilder> opLambda) {
-        NotQueryBuilder builder = QueryBuilders.notQuery(regTermQ("updatedTime", updatedTime));
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
+    public void setUpdatedTime_NotEqual(Long updatedTime, ConditionOptionCall<BoolQueryBuilder> opLambda) {
+        setUpdatedTime_NotTerm(updatedTime, opLambda);
+    }
+
+    public void setUpdatedTime_NotTerm(Long updatedTime, ConditionOptionCall<BoolQueryBuilder> opLambda) {
+        not(not -> not.setUpdatedTime_Term(updatedTime), opLambda);
     }
 
     public void setUpdatedTime_Terms(Collection<Long> updatedTimeList) {
@@ -1162,19 +1127,16 @@ public abstract class BsBoostDocumentRuleCQ extends EsAbstractConditionQuery {
         setUrlExpr_NotTerm(urlExpr, null);
     }
 
-    public void setUrlExpr_NotEqual(String urlExpr, ConditionOptionCall<NotQueryBuilder> opLambda) {
-        setUrlExpr_NotTerm(urlExpr, opLambda);
-    }
-
     public void setUrlExpr_NotTerm(String urlExpr) {
         setUrlExpr_NotTerm(urlExpr, null);
     }
 
-    public void setUrlExpr_NotTerm(String urlExpr, ConditionOptionCall<NotQueryBuilder> opLambda) {
-        NotQueryBuilder builder = QueryBuilders.notQuery(regTermQ("urlExpr", urlExpr));
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
+    public void setUrlExpr_NotEqual(String urlExpr, ConditionOptionCall<BoolQueryBuilder> opLambda) {
+        setUrlExpr_NotTerm(urlExpr, opLambda);
+    }
+
+    public void setUrlExpr_NotTerm(String urlExpr, ConditionOptionCall<BoolQueryBuilder> opLambda) {
+        not(not -> not.setUrlExpr_Term(urlExpr), opLambda);
     }
 
     public void setUrlExpr_Terms(Collection<String> urlExprList) {

src/main/java/org/codelibs/fess/es/config/cbean/cq/bs/BsCrawlingInfoCQ.java

@@ -21,14 +21,11 @@ import java.util.Collection;
 import org.codelibs.fess.es.config.allcommon.EsAbstractConditionQuery;
 import org.codelibs.fess.es.config.cbean.cq.CrawlingInfoCQ;
 import org.dbflute.cbean.ckey.ConditionKey;
-import org.dbflute.exception.IllegalConditionBeanOperationException;
 import org.elasticsearch.index.query.BoolQueryBuilder;
 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;
@@ -70,19 +67,8 @@ public abstract class BsCrawlingInfoCQ extends EsAbstractConditionQuery {
         not(notLambda, null);
     }
 
-    public void not(OperatorCall<CrawlingInfoCQ> notLambda, ConditionOptionCall<NotQueryBuilder> opLambda) {
-        CrawlingInfoCQ notQuery = new CrawlingInfoCQ();
-        notLambda.callback(notQuery);
-        if (notQuery.hasQueries()) {
-            if (notQuery.getQueryBuilderList().size() > 1) {
-                final String msg = "not query must be one query.";
-                throw new IllegalConditionBeanOperationException(msg);
-            }
-            NotQueryBuilder builder = QueryBuilders.notQuery(notQuery.getQueryBuilderList().get(0));
-            if (opLambda != null) {
-                opLambda.callback(builder);
-            }
-        }
+    public void not(final OperatorCall<CrawlingInfoCQ> notLambda, final ConditionOptionCall<BoolQueryBuilder> opLambda) {
+        bool((must, should, mustNot, filter) -> notLambda.callback(mustNot), opLambda);
     }
 
     public void bool(BoolCall<CrawlingInfoCQ> boolLambda) {
@@ -131,19 +117,16 @@ public abstract class BsCrawlingInfoCQ extends EsAbstractConditionQuery {
         setId_NotTerm(id, null);
     }
 
-    public void setId_NotEqual(String id, ConditionOptionCall<NotQueryBuilder> opLambda) {
-        setId_NotTerm(id, opLambda);
-    }
-
     public void setId_NotTerm(String id) {
         setId_NotTerm(id, null);
     }
 
-    public void setId_NotTerm(String id, ConditionOptionCall<NotQueryBuilder> opLambda) {
-        NotQueryBuilder builder = QueryBuilders.notQuery(regTermQ("_id", id));
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
+    public void setId_NotEqual(String id, ConditionOptionCall<BoolQueryBuilder> opLambda) {
+        setId_NotTerm(id, opLambda);
+    }
+
+    public void setId_NotTerm(String id, ConditionOptionCall<BoolQueryBuilder> opLambda) {
+        not(not -> not.setId_Term(id), opLambda);
     }
 
     public void setId_Terms(Collection<String> idList) {
@@ -198,19 +181,16 @@ public abstract class BsCrawlingInfoCQ extends EsAbstractConditionQuery {
         setCreatedTime_NotTerm(createdTime, null);
     }
 
-    public void setCreatedTime_NotEqual(Long createdTime, ConditionOptionCall<NotQueryBuilder> opLambda) {
-        setCreatedTime_NotTerm(createdTime, opLambda);
-    }
-
     public void setCreatedTime_NotTerm(Long createdTime) {
         setCreatedTime_NotTerm(createdTime, null);
     }
 
-    public void setCreatedTime_NotTerm(Long createdTime, ConditionOptionCall<NotQueryBuilder> opLambda) {
-        NotQueryBuilder builder = QueryBuilders.notQuery(regTermQ("createdTime", createdTime));
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
+    public void setCreatedTime_NotEqual(Long createdTime, ConditionOptionCall<BoolQueryBuilder> opLambda) {
+        setCreatedTime_NotTerm(createdTime, opLambda);
+    }
+
+    public void setCreatedTime_NotTerm(Long createdTime, ConditionOptionCall<BoolQueryBuilder> opLambda) {
+        not(not -> not.setCreatedTime_Term(createdTime), opLambda);
     }
 
     public void setCreatedTime_Terms(Collection<Long> createdTimeList) {
@@ -353,19 +333,16 @@ public abstract class BsCrawlingInfoCQ extends EsAbstractConditionQuery {
         setExpiredTime_NotTerm(expiredTime, null);
     }
 
-    public void setExpiredTime_NotEqual(Long expiredTime, ConditionOptionCall<NotQueryBuilder> opLambda) {
-        setExpiredTime_NotTerm(expiredTime, opLambda);
-    }
-
     public void setExpiredTime_NotTerm(Long expiredTime) {
         setExpiredTime_NotTerm(expiredTime, null);
     }
 
-    public void setExpiredTime_NotTerm(Long expiredTime, ConditionOptionCall<NotQueryBuilder> opLambda) {
-        NotQueryBuilder builder = QueryBuilders.notQuery(regTermQ("expiredTime", expiredTime));
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
+    public void setExpiredTime_NotEqual(Long expiredTime, ConditionOptionCall<BoolQueryBuilder> opLambda) {
+        setExpiredTime_NotTerm(expiredTime, opLambda);
+    }
+
+    public void setExpiredTime_NotTerm(Long expiredTime, ConditionOptionCall<BoolQueryBuilder> opLambda) {
+        not(not -> not.setExpiredTime_Term(expiredTime), opLambda);
     }
 
     public void setExpiredTime_Terms(Collection<Long> expiredTimeList) {
@@ -508,19 +485,16 @@ public abstract class BsCrawlingInfoCQ extends EsAbstractConditionQuery {
         setName_NotTerm(name, null);
     }
 
-    public void setName_NotEqual(String name, ConditionOptionCall<NotQueryBuilder> opLambda) {
-        setName_NotTerm(name, opLambda);
-    }
-
     public void setName_NotTerm(String name) {
         setName_NotTerm(name, null);
     }
 
-    public void setName_NotTerm(String name, ConditionOptionCall<NotQueryBuilder> opLambda) {
-        NotQueryBuilder builder = QueryBuilders.notQuery(regTermQ("name", name));
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
+    public void setName_NotEqual(String name, ConditionOptionCall<BoolQueryBuilder> opLambda) {
+        setName_NotTerm(name, opLambda);
+    }
+
+    public void setName_NotTerm(String name, ConditionOptionCall<BoolQueryBuilder> opLambda) {
+        not(not -> not.setName_Term(name), opLambda);
     }
 
     public void setName_Terms(Collection<String> nameList) {
@@ -674,19 +648,16 @@ public abstract class BsCrawlingInfoCQ extends EsAbstractConditionQuery {
         setSessionId_NotTerm(sessionId, null);
     }
 
-    public void setSessionId_NotEqual(String sessionId, ConditionOptionCall<NotQueryBuilder> opLambda) {
-        setSessionId_NotTerm(sessionId, opLambda);
-    }
-
     public void setSessionId_NotTerm(String sessionId) {
         setSessionId_NotTerm(sessionId, null);
     }
 
-    public void setSessionId_NotTerm(String sessionId, ConditionOptionCall<NotQueryBuilder> opLambda) {
-        NotQueryBuilder builder = QueryBuilders.notQuery(regTermQ("sessionId", sessionId));
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
+    public void setSessionId_NotEqual(String sessionId, ConditionOptionCall<BoolQueryBuilder> opLambda) {
+        setSessionId_NotTerm(sessionId, opLambda);
+    }
+
+    public void setSessionId_NotTerm(String sessionId, ConditionOptionCall<BoolQueryBuilder> opLambda) {
+        not(not -> not.setSessionId_Term(sessionId), opLambda);
     }
 
     public void setSessionId_Terms(Collection<String> sessionIdList) {

src/main/java/org/codelibs/fess/es/config/cbean/cq/bs/BsCrawlingInfoParamCQ.java

@@ -21,14 +21,11 @@ import java.util.Collection;
 import org.codelibs.fess.es.config.allcommon.EsAbstractConditionQuery;
 import org.codelibs.fess.es.config.cbean.cq.CrawlingInfoParamCQ;
 import org.dbflute.cbean.ckey.ConditionKey;
-import org.dbflute.exception.IllegalConditionBeanOperationException;
 import org.elasticsearch.index.query.BoolQueryBuilder;
 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;
@@ -71,19 +68,8 @@ public abstract class BsCrawlingInfoParamCQ extends EsAbstractConditionQuery {
         not(notLambda, null);
     }
 
-    public void not(OperatorCall<CrawlingInfoParamCQ> notLambda, ConditionOptionCall<NotQueryBuilder> opLambda) {
-        CrawlingInfoParamCQ notQuery = new CrawlingInfoParamCQ();
-        notLambda.callback(notQuery);
-        if (notQuery.hasQueries()) {
-            if (notQuery.getQueryBuilderList().size() > 1) {
-                final String msg = "not query must be one query.";
-                throw new IllegalConditionBeanOperationException(msg);
-            }
-            NotQueryBuilder builder = QueryBuilders.notQuery(notQuery.getQueryBuilderList().get(0));
-            if (opLambda != null) {
-                opLambda.callback(builder);
-            }
-        }
+    public void not(final OperatorCall<CrawlingInfoParamCQ> notLambda, final ConditionOptionCall<BoolQueryBuilder> opLambda) {
+        bool((must, should, mustNot, filter) -> notLambda.callback(mustNot), opLambda);
     }
 
     public void bool(BoolCall<CrawlingInfoParamCQ> boolLambda) {
@@ -132,19 +118,16 @@ public abstract class BsCrawlingInfoParamCQ extends EsAbstractConditionQuery {
         setId_NotTerm(id, null);
     }
 
-    public void setId_NotEqual(String id, ConditionOptionCall<NotQueryBuilder> opLambda) {
-        setId_NotTerm(id, opLambda);
-    }
-
     public void setId_NotTerm(String id) {
         setId_NotTerm(id, null);
     }
 
-    public void setId_NotTerm(String id, ConditionOptionCall<NotQueryBuilder> opLambda) {
-        NotQueryBuilder builder = QueryBuilders.notQuery(regTermQ("_id", id));
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
+    public void setId_NotEqual(String id, ConditionOptionCall<BoolQueryBuilder> opLambda) {
+        setId_NotTerm(id, opLambda);
+    }
+
+    public void setId_NotTerm(String id, ConditionOptionCall<BoolQueryBuilder> opLambda) {
+        not(not -> not.setId_Term(id), opLambda);
     }
 
     public void setId_Terms(Collection<String> idList) {
@@ -199,19 +182,16 @@ public abstract class BsCrawlingInfoParamCQ extends EsAbstractConditionQuery {
         setCrawlingInfoId_NotTerm(crawlingInfoId, null);
     }
 
-    public void setCrawlingInfoId_NotEqual(String crawlingInfoId, ConditionOptionCall<NotQueryBuilder> opLambda) {
-        setCrawlingInfoId_NotTerm(crawlingInfoId, opLambda);
-    }
-
     public void setCrawlingInfoId_NotTerm(String crawlingInfoId) {
         setCrawlingInfoId_NotTerm(crawlingInfoId, null);
     }
 
-    public void setCrawlingInfoId_NotTerm(String crawlingInfoId, ConditionOptionCall<NotQueryBuilder> opLambda) {
-        NotQueryBuilder builder = QueryBuilders.notQuery(regTermQ("crawlingInfoId", crawlingInfoId));
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
+    public void setCrawlingInfoId_NotEqual(String crawlingInfoId, ConditionOptionCall<BoolQueryBuilder> opLambda) {
+        setCrawlingInfoId_NotTerm(crawlingInfoId, opLambda);
+    }
+
+    public void setCrawlingInfoId_NotTerm(String crawlingInfoId, ConditionOptionCall<BoolQueryBuilder> opLambda) {
+        not(not -> not.setCrawlingInfoId_Term(crawlingInfoId), opLambda);
     }
 
     public void setCrawlingInfoId_Terms(Collection<String> crawlingInfoIdList) {
@@ -365,19 +345,16 @@ public abstract class BsCrawlingInfoParamCQ extends EsAbstractConditionQuery {
         setCreatedTime_NotTerm(createdTime, null);
     }
 
-    public void setCreatedTime_NotEqual(Long createdTime, ConditionOptionCall<NotQueryBuilder> opLambda) {
-        setCreatedTime_NotTerm(createdTime, opLambda);
-    }
-
     public void setCreatedTime_NotTerm(Long createdTime) {
         setCreatedTime_NotTerm(createdTime, null);
     }
 
-    public void setCreatedTime_NotTerm(Long createdTime, ConditionOptionCall<NotQueryBuilder> opLambda) {
-        NotQueryBuilder builder = QueryBuilders.notQuery(regTermQ("createdTime", createdTime));
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
+    public void setCreatedTime_NotEqual(Long createdTime, ConditionOptionCall<BoolQueryBuilder> opLambda) {
+        setCreatedTime_NotTerm(createdTime, opLambda);
+    }
+
+    public void setCreatedTime_NotTerm(Long createdTime, ConditionOptionCall<BoolQueryBuilder> opLambda) {
+        not(not -> not.setCreatedTime_Term(createdTime), opLambda);
     }
 
     public void setCreatedTime_Terms(Collection<Long> createdTimeList) {
@@ -520,19 +497,16 @@ public abstract class BsCrawlingInfoParamCQ extends EsAbstractConditionQuery {
         setKey_NotTerm(key, null);
     }
 
-    public void setKey_NotEqual(String key, ConditionOptionCall<NotQueryBuilder> opLambda) {
-        setKey_NotTerm(key, opLambda);
-    }
-
     public void setKey_NotTerm(String key) {
         setKey_NotTerm(key, null);
     }
 
-    public void setKey_NotTerm(String key, ConditionOptionCall<NotQueryBuilder> opLambda) {
-        NotQueryBuilder builder = QueryBuilders.notQuery(regTermQ("key", key));
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
+    public void setKey_NotEqual(String key, ConditionOptionCall<BoolQueryBuilder> opLambda) {
+        setKey_NotTerm(key, opLambda);
+    }
+
+    public void setKey_NotTerm(String key, ConditionOptionCall<BoolQueryBuilder> opLambda) {
+        not(not -> not.setKey_Term(key), opLambda);
     }
 
     public void setKey_Terms(Collection<String> keyList) {
@@ -686,19 +660,16 @@ public abstract class BsCrawlingInfoParamCQ extends EsAbstractConditionQuery {
         setValue_NotTerm(value, null);
     }
 
-    public void setValue_NotEqual(String value, ConditionOptionCall<NotQueryBuilder> opLambda) {
-        setValue_NotTerm(value, opLambda);
-    }
-
     public void setValue_NotTerm(String value) {
         setValue_NotTerm(value, null);
     }
 
-    public void setValue_NotTerm(String value, ConditionOptionCall<NotQueryBuilder> opLambda) {
-        NotQueryBuilder builder = QueryBuilders.notQuery(regTermQ("value", value));
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
+    public void setValue_NotEqual(String value, ConditionOptionCall<BoolQueryBuilder> opLambda) {
+        setValue_NotTerm(value, opLambda);
+    }
+
+    public void setValue_NotTerm(String value, ConditionOptionCall<BoolQueryBuilder> opLambda) {
+        not(not -> not.setValue_Term(value), opLambda);
     }
 
     public void setValue_Terms(Collection<String> valueList) {

src/main/java/org/codelibs/fess/es/config/cbean/cq/bs/BsDataConfigCQ.java

@@ -21,14 +21,11 @@ import java.util.Collection;
 import org.codelibs.fess.es.config.allcommon.EsAbstractConditionQuery;
 import org.codelibs.fess.es.config.cbean.cq.DataConfigCQ;
 import org.dbflute.cbean.ckey.ConditionKey;
-import org.dbflute.exception.IllegalConditionBeanOperationException;
 import org.elasticsearch.index.query.BoolQueryBuilder;
 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;
@@ -70,19 +67,8 @@ public abstract class BsDataConfigCQ extends EsAbstractConditionQuery {
         not(notLambda, null);
     }
 
-    public void not(OperatorCall<DataConfigCQ> notLambda, ConditionOptionCall<NotQueryBuilder> opLambda) {
-        DataConfigCQ notQuery = new DataConfigCQ();
-        notLambda.callback(notQuery);
-        if (notQuery.hasQueries()) {
-            if (notQuery.getQueryBuilderList().size() > 1) {
-                final String msg = "not query must be one query.";
-                throw new IllegalConditionBeanOperationException(msg);
-            }
-            NotQueryBuilder builder = QueryBuilders.notQuery(notQuery.getQueryBuilderList().get(0));
-            if (opLambda != null) {
-                opLambda.callback(builder);
-            }
-        }
+    public void not(final OperatorCall<DataConfigCQ> notLambda, final ConditionOptionCall<BoolQueryBuilder> opLambda) {
+        bool((must, should, mustNot, filter) -> notLambda.callback(mustNot), opLambda);
     }
 
     public void bool(BoolCall<DataConfigCQ> boolLambda) {
@@ -131,19 +117,16 @@ public abstract class BsDataConfigCQ extends EsAbstractConditionQuery {
         setId_NotTerm(id, null);
     }
 
-    public void setId_NotEqual(String id, ConditionOptionCall<NotQueryBuilder> opLambda) {
-        setId_NotTerm(id, opLambda);
-    }
-
     public void setId_NotTerm(String id) {
         setId_NotTerm(id, null);
     }
 
-    public void setId_NotTerm(String id, ConditionOptionCall<NotQueryBuilder> opLambda) {
-        NotQueryBuilder builder = QueryBuilders.notQuery(regTermQ("_id", id));
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
+    public void setId_NotEqual(String id, ConditionOptionCall<BoolQueryBuilder> opLambda) {
+        setId_NotTerm(id, opLambda);
+    }
+
+    public void setId_NotTerm(String id, ConditionOptionCall<BoolQueryBuilder> opLambda) {
+        not(not -> not.setId_Term(id), opLambda);
     }
 
     public void setId_Terms(Collection<String> idList) {
@@ -198,19 +181,16 @@ public abstract class BsDataConfigCQ extends EsAbstractConditionQuery {
         setAvailable_NotTerm(available, null);
     }
 
-    public void setAvailable_NotEqual(Boolean available, ConditionOptionCall<NotQueryBuilder> opLambda) {
-        setAvailable_NotTerm(available, opLambda);
-    }
-
     public void setAvailable_NotTerm(Boolean available) {
         setAvailable_NotTerm(available, null);
     }
 
-    public void setAvailable_NotTerm(Boolean available, ConditionOptionCall<NotQueryBuilder> opLambda) {
-        NotQueryBuilder builder = QueryBuilders.notQuery(regTermQ("available", available));
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
+    public void setAvailable_NotEqual(Boolean available, ConditionOptionCall<BoolQueryBuilder> opLambda) {
+        setAvailable_NotTerm(available, opLambda);
+    }
+
+    public void setAvailable_NotTerm(Boolean available, ConditionOptionCall<BoolQueryBuilder> opLambda) {
+        not(not -> not.setAvailable_Term(available), opLambda);
     }
 
     public void setAvailable_Terms(Collection<Boolean> availableList) {
@@ -353,19 +333,16 @@ public abstract class BsDataConfigCQ extends EsAbstractConditionQuery {
         setBoost_NotTerm(boost, null);
     }
 
-    public void setBoost_NotEqual(Float boost, ConditionOptionCall<NotQueryBuilder> opLambda) {
-        setBoost_NotTerm(boost, opLambda);
-    }
-
     public void setBoost_NotTerm(Float boost) {
         setBoost_NotTerm(boost, null);
     }
 
-    public void setBoost_NotTerm(Float boost, ConditionOptionCall<NotQueryBuilder> opLambda) {
-        NotQueryBuilder builder = QueryBuilders.notQuery(regTermQ("boost", boost));
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
+    public void setBoost_NotEqual(Float boost, ConditionOptionCall<BoolQueryBuilder> opLambda) {
+        setBoost_NotTerm(boost, opLambda);
+    }
+
+    public void setBoost_NotTerm(Float boost, ConditionOptionCall<BoolQueryBuilder> opLambda) {
+        not(not -> not.setBoost_Term(boost), opLambda);
     }
 
     public void setBoost_Terms(Collection<Float> boostList) {
@@ -508,19 +485,16 @@ public abstract class BsDataConfigCQ extends EsAbstractConditionQuery {
         setCreatedBy_NotTerm(createdBy, null);
     }
 
-    public void setCreatedBy_NotEqual(String createdBy, ConditionOptionCall<NotQueryBuilder> opLambda) {
-        setCreatedBy_NotTerm(createdBy, opLambda);
-    }
-
     public void setCreatedBy_NotTerm(String createdBy) {
         setCreatedBy_NotTerm(createdBy, null);
     }
 
-    public void setCreatedBy_NotTerm(String createdBy, ConditionOptionCall<NotQueryBuilder> opLambda) {
-        NotQueryBuilder builder = QueryBuilders.notQuery(regTermQ("createdBy", createdBy));
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
+    public void setCreatedBy_NotEqual(String createdBy, ConditionOptionCall<BoolQueryBuilder> opLambda) {
+        setCreatedBy_NotTerm(createdBy, opLambda);
+    }
+
+    public void setCreatedBy_NotTerm(String createdBy, ConditionOptionCall<BoolQueryBuilder> opLambda) {
+        not(not -> not.setCreatedBy_Term(createdBy), opLambda);
     }
 
     public void setCreatedBy_Terms(Collection<String> createdByList) {
@@ -674,19 +648,16 @@ public abstract class BsDataConfigCQ extends EsAbstractConditionQuery {
         setCreatedTime_NotTerm(createdTime, null);
     }
 
-    public void setCreatedTime_NotEqual(Long createdTime, ConditionOptionCall<NotQueryBuilder> opLambda) {
-        setCreatedTime_NotTerm(createdTime, opLambda);
-    }
-
     public void setCreatedTime_NotTerm(Long createdTime) {
         setCreatedTime_NotTerm(createdTime, null);
     }
 
-    public void setCreatedTime_NotTerm(Long createdTime, ConditionOptionCall<NotQueryBuilder> opLambda) {
-        NotQueryBuilder builder = QueryBuilders.notQuery(regTermQ("createdTime", createdTime));
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
+    public void setCreatedTime_NotEqual(Long createdTime, ConditionOptionCall<BoolQueryBuilder> opLambda) {
+        setCreatedTime_NotTerm(createdTime, opLambda);
+    }
+
+    public void setCreatedTime_NotTerm(Long createdTime, ConditionOptionCall<BoolQueryBuilder> opLambda) {
+        not(not -> not.setCreatedTime_Term(createdTime), opLambda);
     }
 
     public void setCreatedTime_Terms(Collection<Long> createdTimeList) {
@@ -829,19 +800,16 @@ public abstract class BsDataConfigCQ extends EsAbstractConditionQuery {
         setHandlerName_NotTerm(handlerName, null);
     }
 
-    public void setHandlerName_NotEqual(String handlerName, ConditionOptionCall<NotQueryBuilder> opLambda) {
-        setHandlerName_NotTerm(handlerName, opLambda);
-    }
-
     public void setHandlerName_NotTerm(String handlerName) {
         setHandlerName_NotTerm(handlerName, null);
     }
 
-    public void setHandlerName_NotTerm(String handlerName, ConditionOptionCall<NotQueryBuilder> opLambda) {
-        NotQueryBuilder builder = QueryBuilders.notQuery(regTermQ("handlerName", handlerName));
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
+    public void setHandlerName_NotEqual(String handlerName, ConditionOptionCall<BoolQueryBuilder> opLambda) {
+        setHandlerName_NotTerm(handlerName, opLambda);
+    }
+
+    public void setHandlerName_NotTerm(String handlerName, ConditionOptionCall<BoolQueryBuilder> opLambda) {
+        not(not -> not.setHandlerName_Term(handlerName), opLambda);
     }
 
     public void setHandlerName_Terms(Collection<String> handlerNameList) {
@@ -995,19 +963,16 @@ public abstract class BsDataConfigCQ extends EsAbstractConditionQuery {
         setHandlerParameter_NotTerm(handlerParameter, null);
     }
 
-    public void setHandlerParameter_NotEqual(String handlerParameter, ConditionOptionCall<NotQueryBuilder> opLambda) {
-        setHandlerParameter_NotTerm(handlerParameter, opLambda);
-    }
-
     public void setHandlerParameter_NotTerm(String handlerParameter) {
         setHandlerParameter_NotTerm(handlerParameter, null);
     }
 
-    public void setHandlerParameter_NotTerm(String handlerParameter, ConditionOptionCall<NotQueryBuilder> opLambda) {
-        NotQueryBuilder builder = QueryBuilders.notQuery(regTermQ("handlerParameter", handlerParameter));
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
+    public void setHandlerParameter_NotEqual(String handlerParameter, ConditionOptionCall<BoolQueryBuilder> opLambda) {
+        setHandlerParameter_NotTerm(handlerParameter, opLambda);
+    }
+
+    public void setHandlerParameter_NotTerm(String handlerParameter, ConditionOptionCall<BoolQueryBuilder> opLambda) {
+        not(not -> not.setHandlerParameter_Term(handlerParameter), opLambda);
     }
 
     public void setHandlerParameter_Terms(Collection<String> handlerParameterList) {
@@ -1161,19 +1126,16 @@ public abstract class BsDataConfigCQ extends EsAbstractConditionQuery {
         setHandlerScript_NotTerm(handlerScript, null);
     }
 
-    public void setHandlerScript_NotEqual(String handlerScript, ConditionOptionCall<NotQueryBuilder> opLambda) {
-        setHandlerScript_NotTerm(handlerScript, opLambda);
-    }
-
     public void setHandlerScript_NotTerm(String handlerScript) {
         setHandlerScript_NotTerm(handlerScript, null);
     }
 
-    public void setHandlerScript_NotTerm(String handlerScript, ConditionOptionCall<NotQueryBuilder> opLambda) {
-        NotQueryBuilder builder = QueryBuilders.notQuery(regTermQ("handlerScript", handlerScript));
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
+    public void setHandlerScript_NotEqual(String handlerScript, ConditionOptionCall<BoolQueryBuilder> opLambda) {
+        setHandlerScript_NotTerm(handlerScript, opLambda);
+    }
+
+    public void setHandlerScript_NotTerm(String handlerScript, ConditionOptionCall<BoolQueryBuilder> opLambda) {
+        not(not -> not.setHandlerScript_Term(handlerScript), opLambda);
     }
 
     public void setHandlerScript_Terms(Collection<String> handlerScriptList) {
@@ -1327,19 +1289,16 @@ public abstract class BsDataConfigCQ extends EsAbstractConditionQuery {
         setName_NotTerm(name, null);
     }
 
-    public void setName_NotEqual(String name, ConditionOptionCall<NotQueryBuilder> opLambda) {
-        setName_NotTerm(name, opLambda);
-    }
-
     public void setName_NotTerm(String name) {
         setName_NotTerm(name, null);
     }
 
-    public void setName_NotTerm(String name, ConditionOptionCall<NotQueryBuilder> opLambda) {
-        NotQueryBuilder builder = QueryBuilders.notQuery(regTermQ("name", name));
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
+    public void setName_NotEqual(String name, ConditionOptionCall<BoolQueryBuilder> opLambda) {
+        setName_NotTerm(name, opLambda);
+    }
+
+    public void setName_NotTerm(String name, ConditionOptionCall<BoolQueryBuilder> opLambda) {
+        not(not -> not.setName_Term(name), opLambda);
     }
 
     public void setName_Terms(Collection<String> nameList) {
@@ -1493,19 +1452,16 @@ public abstract class BsDataConfigCQ extends EsAbstractConditionQuery {
         setPermissions_NotTerm(permissions, null);
     }
 
-    public void setPermissions_NotEqual(String permissions, ConditionOptionCall<NotQueryBuilder> opLambda) {
-        setPermissions_NotTerm(permissions, opLambda);
-    }
-
     public void setPermissions_NotTerm(String permissions) {
         setPermissions_NotTerm(permissions, null);
     }
 
-    public void setPermissions_NotTerm(String permissions, ConditionOptionCall<NotQueryBuilder> opLambda) {
-        NotQueryBuilder builder = QueryBuilders.notQuery(regTermQ("permissions", permissions));
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
+    public void setPermissions_NotEqual(String permissions, ConditionOptionCall<BoolQueryBuilder> opLambda) {
+        setPermissions_NotTerm(permissions, opLambda);
+    }
+
+    public void setPermissions_NotTerm(String permissions, ConditionOptionCall<BoolQueryBuilder> opLambda) {
+        not(not -> not.setPermissions_Term(permissions), opLambda);
     }
 
     public void setPermissions_Terms(Collection<String> permissionsList) {
@@ -1659,19 +1615,16 @@ public abstract class BsDataConfigCQ extends EsAbstractConditionQuery {
         setSortOrder_NotTerm(sortOrder, null);
     }
 
-    public void setSortOrder_NotEqual(Integer sortOrder, ConditionOptionCall<NotQueryBuilder> opLambda) {
-        setSortOrder_NotTerm(sortOrder, opLambda);
-    }
-
     public void setSortOrder_NotTerm(Integer sortOrder) {
         setSortOrder_NotTerm(sortOrder, null);
     }
 
-    public void setSortOrder_NotTerm(Integer sortOrder, ConditionOptionCall<NotQueryBuilder> opLambda) {
-        NotQueryBuilder builder = QueryBuilders.notQuery(regTermQ("sortOrder", sortOrder));
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
+    public void setSortOrder_NotEqual(Integer sortOrder, ConditionOptionCall<BoolQueryBuilder> opLambda) {
+        setSortOrder_NotTerm(sortOrder, opLambda);
+    }
+
+    public void setSortOrder_NotTerm(Integer sortOrder, ConditionOptionCall<BoolQueryBuilder> opLambda) {
+        not(not -> not.setSortOrder_Term(sortOrder), opLambda);
     }
 
     public void setSortOrder_Terms(Collection<Integer> sortOrderList) {
@@ -1814,19 +1767,16 @@ public abstract class BsDataConfigCQ extends EsAbstractConditionQuery {
         setUpdatedBy_NotTerm(updatedBy, null);
     }
 
-    public void setUpdatedBy_NotEqual(String updatedBy, ConditionOptionCall<NotQueryBuilder> opLambda) {
-        setUpdatedBy_NotTerm(updatedBy, opLambda);
-    }
-
     public void setUpdatedBy_NotTerm(String updatedBy) {
         setUpdatedBy_NotTerm(updatedBy, null);
     }
 
-    public void setUpdatedBy_NotTerm(String updatedBy, ConditionOptionCall<NotQueryBuilder> opLambda) {
-        NotQueryBuilder builder = QueryBuilders.notQuery(regTermQ("updatedBy", updatedBy));
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
+    public void setUpdatedBy_NotEqual(String updatedBy, ConditionOptionCall<BoolQueryBuilder> opLambda) {
+        setUpdatedBy_NotTerm(updatedBy, opLambda);
+    }
+
+    public void setUpdatedBy_NotTerm(String updatedBy, ConditionOptionCall<BoolQueryBuilder> opLambda) {
+        not(not -> not.setUpdatedBy_Term(updatedBy), opLambda);
     }
 
     public void setUpdatedBy_Terms(Collection<String> updatedByList) {
@@ -1980,19 +1930,16 @@ public abstract class BsDataConfigCQ extends EsAbstractConditionQuery {
         setUpdatedTime_NotTerm(updatedTime, null);
     }
 
-    public void setUpdatedTime_NotEqual(Long updatedTime, ConditionOptionCall<NotQueryBuilder> opLambda) {
-        setUpdatedTime_NotTerm(updatedTime, opLambda);
-    }
-
     public void setUpdatedTime_NotTerm(Long updatedTime) {
         setUpdatedTime_NotTerm(updatedTime, null);
     }
 
-    public void setUpdatedTime_NotTerm(Long updatedTime, ConditionOptionCall<NotQueryBuilder> opLambda) {
-        NotQueryBuilder builder = QueryBuilders.notQuery(regTermQ("updatedTime", updatedTime));
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
+    public void setUpdatedTime_NotEqual(Long updatedTime, ConditionOptionCall<BoolQueryBuilder> opLambda) {
+        setUpdatedTime_NotTerm(updatedTime, opLambda);
+    }
+
+    public void setUpdatedTime_NotTerm(Long updatedTime, ConditionOptionCall<BoolQueryBuilder> opLambda) {
+        not(not -> not.setUpdatedTime_Term(updatedTime), opLambda);
     }
 
     public void setUpdatedTime_Terms(Collection<Long> updatedTimeList) {

src/main/java/org/codelibs/fess/es/config/cbean/cq/bs/BsDataConfigToLabelCQ.java

@@ -21,14 +21,11 @@ import java.util.Collection;
 import org.codelibs.fess.es.config.allcommon.EsAbstractConditionQuery;
 import org.codelibs.fess.es.config.cbean.cq.DataConfigToLabelCQ;
 import org.dbflute.cbean.ckey.ConditionKey;
-import org.dbflute.exception.IllegalConditionBeanOperationException;
 import org.elasticsearch.index.query.BoolQueryBuilder;
 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;
@@ -71,19 +68,8 @@ public abstract class BsDataConfigToLabelCQ extends EsAbstractConditionQuery {
         not(notLambda, null);
     }
 
-    public void not(OperatorCall<DataConfigToLabelCQ> notLambda, ConditionOptionCall<NotQueryBuilder> opLambda) {
-        DataConfigToLabelCQ notQuery = new DataConfigToLabelCQ();
-        notLambda.callback(notQuery);
-        if (notQuery.hasQueries()) {
-            if (notQuery.getQueryBuilderList().size() > 1) {
-                final String msg = "not query must be one query.";
-                throw new IllegalConditionBeanOperationException(msg);
-            }
-            NotQueryBuilder builder = QueryBuilders.notQuery(notQuery.getQueryBuilderList().get(0));
-            if (opLambda != null) {
-                opLambda.callback(builder);
-            }
-        }
+    public void not(final OperatorCall<DataConfigToLabelCQ> notLambda, final ConditionOptionCall<BoolQueryBuilder> opLambda) {
+        bool((must, should, mustNot, filter) -> notLambda.callback(mustNot), opLambda);
     }
 
     public void bool(BoolCall<DataConfigToLabelCQ> boolLambda) {
@@ -132,19 +118,16 @@ public abstract class BsDataConfigToLabelCQ extends EsAbstractConditionQuery {
         setId_NotTerm(id, null);
     }
 
-    public void setId_NotEqual(String id, ConditionOptionCall<NotQueryBuilder> opLambda) {
-        setId_NotTerm(id, opLambda);
-    }
-
     public void setId_NotTerm(String id) {
         setId_NotTerm(id, null);
     }
 
-    public void setId_NotTerm(String id, ConditionOptionCall<NotQueryBuilder> opLambda) {
-        NotQueryBuilder builder = QueryBuilders.notQuery(regTermQ("_id", id));
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
+    public void setId_NotEqual(String id, ConditionOptionCall<BoolQueryBuilder> opLambda) {
+        setId_NotTerm(id, opLambda);
+    }
+
+    public void setId_NotTerm(String id, ConditionOptionCall<BoolQueryBuilder> opLambda) {
+        not(not -> not.setId_Term(id), opLambda);
     }
 
     public void setId_Terms(Collection<String> idList) {
@@ -199,19 +182,16 @@ public abstract class BsDataConfigToLabelCQ extends EsAbstractConditionQuery {
         setDataConfigId_NotTerm(dataConfigId, null);
     }
 
-    public void setDataConfigId_NotEqual(String dataConfigId, ConditionOptionCall<NotQueryBuilder> opLambda) {
-        setDataConfigId_NotTerm(dataConfigId, opLambda);
-    }
-
     public void setDataConfigId_NotTerm(String dataConfigId) {
         setDataConfigId_NotTerm(dataConfigId, null);
     }
 
-    public void setDataConfigId_NotTerm(String dataConfigId, ConditionOptionCall<NotQueryBuilder> opLambda) {
-        NotQueryBuilder builder = QueryBuilders.notQuery(regTermQ("dataConfigId", dataConfigId));
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
+    public void setDataConfigId_NotEqual(String dataConfigId, ConditionOptionCall<BoolQueryBuilder> opLambda) {
+        setDataConfigId_NotTerm(dataConfigId, opLambda);
+    }
+
+    public void setDataConfigId_NotTerm(String dataConfigId, ConditionOptionCall<BoolQueryBuilder> opLambda) {
+        not(not -> not.setDataConfigId_Term(dataConfigId), opLambda);
     }
 
     public void setDataConfigId_Terms(Collection<String> dataConfigIdList) {
@@ -365,19 +345,16 @@ public abstract class BsDataConfigToLabelCQ extends EsAbstractConditionQuery {
         setLabelTypeId_NotTerm(labelTypeId, null);
     }
 
-    public void setLabelTypeId_NotEqual(String labelTypeId, ConditionOptionCall<NotQueryBuilder> opLambda) {
-        setLabelTypeId_NotTerm(labelTypeId, opLambda);
-    }
-
     public void setLabelTypeId_NotTerm(String labelTypeId) {
         setLabelTypeId_NotTerm(labelTypeId, null);
     }
 
-    public void setLabelTypeId_NotTerm(String labelTypeId, ConditionOptionCall<NotQueryBuilder> opLambda) {
-        NotQueryBuilder builder = QueryBuilders.notQuery(regTermQ("labelTypeId", labelTypeId));
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
+    public void setLabelTypeId_NotEqual(String labelTypeId, ConditionOptionCall<BoolQueryBuilder> opLambda) {
+        setLabelTypeId_NotTerm(labelTypeId, opLambda);
+    }
+
+    public void setLabelTypeId_NotTerm(String labelTypeId, ConditionOptionCall<BoolQueryBuilder> opLambda) {
+        not(not -> not.setLabelTypeId_Term(labelTypeId), opLambda);
     }
 
     public void setLabelTypeId_Terms(Collection<String> labelTypeIdList) {

src/main/java/org/codelibs/fess/es/config/cbean/cq/bs/BsDataConfigToRoleCQ.java

@@ -21,14 +21,11 @@ import java.util.Collection;
 import org.codelibs.fess.es.config.allcommon.EsAbstractConditionQuery;
 import org.codelibs.fess.es.config.cbean.cq.DataConfigToRoleCQ;
 import org.dbflute.cbean.ckey.ConditionKey;
-import org.dbflute.exception.IllegalConditionBeanOperationException;
 import org.elasticsearch.index.query.BoolQueryBuilder;
 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;
@@ -70,19 +67,8 @@ public abstract class BsDataConfigToRoleCQ extends EsAbstractConditionQuery {
         not(notLambda, null);
     }
 
-    public void not(OperatorCall<DataConfigToRoleCQ> notLambda, ConditionOptionCall<NotQueryBuilder> opLambda) {
-        DataConfigToRoleCQ notQuery = new DataConfigToRoleCQ();
-        notLambda.callback(notQuery);
-        if (notQuery.hasQueries()) {
-            if (notQuery.getQueryBuilderList().size() > 1) {
-                final String msg = "not query must be one query.";
-                throw new IllegalConditionBeanOperationException(msg);
-            }
-            NotQueryBuilder builder = QueryBuilders.notQuery(notQuery.getQueryBuilderList().get(0));
-            if (opLambda != null) {
-                opLambda.callback(builder);
-            }
-        }
+    public void not(final OperatorCall<DataConfigToRoleCQ> notLambda, final ConditionOptionCall<BoolQueryBuilder> opLambda) {
+        bool((must, should, mustNot, filter) -> notLambda.callback(mustNot), opLambda);
     }
 
     public void bool(BoolCall<DataConfigToRoleCQ> boolLambda) {
@@ -131,19 +117,16 @@ public abstract class BsDataConfigToRoleCQ extends EsAbstractConditionQuery {
         setId_NotTerm(id, null);
     }
 
-    public void setId_NotEqual(String id, ConditionOptionCall<NotQueryBuilder> opLambda) {
-        setId_NotTerm(id, opLambda);
-    }
-
     public void setId_NotTerm(String id) {
         setId_NotTerm(id, null);
     }
 
-    public void setId_NotTerm(String id, ConditionOptionCall<NotQueryBuilder> opLambda) {
-        NotQueryBuilder builder = QueryBuilders.notQuery(regTermQ("_id", id));
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
+    public void setId_NotEqual(String id, ConditionOptionCall<BoolQueryBuilder> opLambda) {
+        setId_NotTerm(id, opLambda);
+    }
+
+    public void setId_NotTerm(String id, ConditionOptionCall<BoolQueryBuilder> opLambda) {
+        not(not -> not.setId_Term(id), opLambda);
     }
 
     public void setId_Terms(Collection<String> idList) {
@@ -198,19 +181,16 @@ public abstract class BsDataConfigToRoleCQ extends EsAbstractConditionQuery {
         setDataConfigId_NotTerm(dataConfigId, null);
     }
 
-    public void setDataConfigId_NotEqual(String dataConfigId, ConditionOptionCall<NotQueryBuilder> opLambda) {
-        setDataConfigId_NotTerm(dataConfigId, opLambda);
-    }
-
     public void setDataConfigId_NotTerm(String dataConfigId) {
         setDataConfigId_NotTerm(dataConfigId, null);
     }
 
-    public void setDataConfigId_NotTerm(String dataConfigId, ConditionOptionCall<NotQueryBuilder> opLambda) {
-        NotQueryBuilder builder = QueryBuilders.notQuery(regTermQ("dataConfigId", dataConfigId));
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
+    public void setDataConfigId_NotEqual(String dataConfigId, ConditionOptionCall<BoolQueryBuilder> opLambda) {
+        setDataConfigId_NotTerm(dataConfigId, opLambda);
+    }
+
+    public void setDataConfigId_NotTerm(String dataConfigId, ConditionOptionCall<BoolQueryBuilder> opLambda) {
+        not(not -> not.setDataConfigId_Term(dataConfigId), opLambda);
     }
 
     public void setDataConfigId_Terms(Collection<String> dataConfigIdList) {
@@ -364,19 +344,16 @@ public abstract class BsDataConfigToRoleCQ extends EsAbstractConditionQuery {
         setRoleTypeId_NotTerm(roleTypeId, null);
     }
 
-    public void setRoleTypeId_NotEqual(String roleTypeId, ConditionOptionCall<NotQueryBuilder> opLambda) {
-        setRoleTypeId_NotTerm(roleTypeId, opLambda);
-    }
-
     public void setRoleTypeId_NotTerm(String roleTypeId) {
         setRoleTypeId_NotTerm(roleTypeId, null);
     }
 
-    public void setRoleTypeId_NotTerm(String roleTypeId, ConditionOptionCall<NotQueryBuilder> opLambda) {
-        NotQueryBuilder builder = QueryBuilders.notQuery(regTermQ("roleTypeId", roleTypeId));
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
+    public void setRoleTypeId_NotEqual(String roleTypeId, ConditionOptionCall<BoolQueryBuilder> opLambda) {
+        setRoleTypeId_NotTerm(roleTypeId, opLambda);
+    }
+
+    public void setRoleTypeId_NotTerm(String roleTypeId, ConditionOptionCall<BoolQueryBuilder> opLambda) {
+        not(not -> not.setRoleTypeId_Term(roleTypeId), opLambda);
     }
 
     public void setRoleTypeId_Terms(Collection<String> roleTypeIdList) {

src/main/java/org/codelibs/fess/es/config/cbean/cq/bs/BsDuplicateHostCQ.java

@@ -21,14 +21,11 @@ import java.util.Collection;
 import org.codelibs.fess.es.config.allcommon.EsAbstractConditionQuery;
 import org.codelibs.fess.es.config.cbean.cq.DuplicateHostCQ;
 import org.dbflute.cbean.ckey.ConditionKey;
-import org.dbflute.exception.IllegalConditionBeanOperationException;
 import org.elasticsearch.index.query.BoolQueryBuilder;
 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;
@@ -70,19 +67,8 @@ public abstract class BsDuplicateHostCQ extends EsAbstractConditionQuery {
         not(notLambda, null);
     }
 
-    public void not(OperatorCall<DuplicateHostCQ> notLambda, ConditionOptionCall<NotQueryBuilder> opLambda) {
-        DuplicateHostCQ notQuery = new DuplicateHostCQ();
-        notLambda.callback(notQuery);
-        if (notQuery.hasQueries()) {
-            if (notQuery.getQueryBuilderList().size() > 1) {
-                final String msg = "not query must be one query.";
-                throw new IllegalConditionBeanOperationException(msg);
-            }
-            NotQueryBuilder builder = QueryBuilders.notQuery(notQuery.getQueryBuilderList().get(0));
-            if (opLambda != null) {
-                opLambda.callback(builder);
-            }
-        }
+    public void not(final OperatorCall<DuplicateHostCQ> notLambda, final ConditionOptionCall<BoolQueryBuilder> opLambda) {
+        bool((must, should, mustNot, filter) -> notLambda.callback(mustNot), opLambda);
     }
 
     public void bool(BoolCall<DuplicateHostCQ> boolLambda) {
@@ -131,19 +117,16 @@ public abstract class BsDuplicateHostCQ extends EsAbstractConditionQuery {
         setId_NotTerm(id, null);
     }
 
-    public void setId_NotEqual(String id, ConditionOptionCall<NotQueryBuilder> opLambda) {
-        setId_NotTerm(id, opLambda);
-    }
-
     public void setId_NotTerm(String id) {
         setId_NotTerm(id, null);
     }
 
-    public void setId_NotTerm(String id, ConditionOptionCall<NotQueryBuilder> opLambda) {
-        NotQueryBuilder builder = QueryBuilders.notQuery(regTermQ("_id", id));
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
+    public void setId_NotEqual(String id, ConditionOptionCall<BoolQueryBuilder> opLambda) {
+        setId_NotTerm(id, opLambda);
+    }
+
+    public void setId_NotTerm(String id, ConditionOptionCall<BoolQueryBuilder> opLambda) {
+        not(not -> not.setId_Term(id), opLambda);
     }
 
     public void setId_Terms(Collection<String> idList) {
@@ -198,19 +181,16 @@ public abstract class BsDuplicateHostCQ extends EsAbstractConditionQuery {
         setCreatedBy_NotTerm(createdBy, null);
     }
 
-    public void setCreatedBy_NotEqual(String createdBy, ConditionOptionCall<NotQueryBuilder> opLambda) {
-        setCreatedBy_NotTerm(createdBy, opLambda);
-    }
-
     public void setCreatedBy_NotTerm(String createdBy) {
         setCreatedBy_NotTerm(createdBy, null);
     }
 
-    public void setCreatedBy_NotTerm(String createdBy, ConditionOptionCall<NotQueryBuilder> opLambda) {
-        NotQueryBuilder builder = QueryBuilders.notQuery(regTermQ("createdBy", createdBy));
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
+    public void setCreatedBy_NotEqual(String createdBy, ConditionOptionCall<BoolQueryBuilder> opLambda) {
+        setCreatedBy_NotTerm(createdBy, opLambda);
+    }
+
+    public void setCreatedBy_NotTerm(String createdBy, ConditionOptionCall<BoolQueryBuilder> opLambda) {
+        not(not -> not.setCreatedBy_Term(createdBy), opLambda);
     }
 
     public void setCreatedBy_Terms(Collection<String> createdByList) {
@@ -364,19 +344,16 @@ public abstract class BsDuplicateHostCQ extends EsAbstractConditionQuery {
         setCreatedTime_NotTerm(createdTime, null);
     }
 
-    public void setCreatedTime_NotEqual(Long createdTime, ConditionOptionCall<NotQueryBuilder> opLambda) {
-        setCreatedTime_NotTerm(createdTime, opLambda);
-    }
-
     public void setCreatedTime_NotTerm(Long createdTime) {
         setCreatedTime_NotTerm(createdTime, null);
     }
 
-    public void setCreatedTime_NotTerm(Long createdTime, ConditionOptionCall<NotQueryBuilder> opLambda) {
-        NotQueryBuilder builder = QueryBuilders.notQuery(regTermQ("createdTime", createdTime));
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
+    public void setCreatedTime_NotEqual(Long createdTime, ConditionOptionCall<BoolQueryBuilder> opLambda) {
+        setCreatedTime_NotTerm(createdTime, opLambda);
+    }
+
+    public void setCreatedTime_NotTerm(Long createdTime, ConditionOptionCall<BoolQueryBuilder> opLambda) {
+        not(not -> not.setCreatedTime_Term(createdTime), opLambda);
     }
 
     public void setCreatedTime_Terms(Collection<Long> createdTimeList) {
@@ -519,19 +496,16 @@ public abstract class BsDuplicateHostCQ extends EsAbstractConditionQuery {
         setDuplicateHostName_NotTerm(duplicateHostName, null);
     }
 
-    public void setDuplicateHostName_NotEqual(String duplicateHostName, ConditionOptionCall<NotQueryBuilder> opLambda) {
-        setDuplicateHostName_NotTerm(duplicateHostName, opLambda);
-    }
-
     public void setDuplicateHostName_NotTerm(String duplicateHostName) {
         setDuplicateHostName_NotTerm(duplicateHostName, null);
     }
 
-    public void setDuplicateHostName_NotTerm(String duplicateHostName, ConditionOptionCall<NotQueryBuilder> opLambda) {
-        NotQueryBuilder builder = QueryBuilders.notQuery(regTermQ("duplicateHostName", duplicateHostName));
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
+    public void setDuplicateHostName_NotEqual(String duplicateHostName, ConditionOptionCall<BoolQueryBuilder> opLambda) {
+        setDuplicateHostName_NotTerm(duplicateHostName, opLambda);
+    }
+
+    public void setDuplicateHostName_NotTerm(String duplicateHostName, ConditionOptionCall<BoolQueryBuilder> opLambda) {
+        not(not -> not.setDuplicateHostName_Term(duplicateHostName), opLambda);
     }
 
     public void setDuplicateHostName_Terms(Collection<String> duplicateHostNameList) {
@@ -685,19 +659,16 @@ public abstract class BsDuplicateHostCQ extends EsAbstractConditionQuery {
         setRegularName_NotTerm(regularName, null);
     }
 
-    public void setRegularName_NotEqual(String regularName, ConditionOptionCall<NotQueryBuilder> opLambda) {
-        setRegularName_NotTerm(regularName, opLambda);
-    }
-
     public void setRegularName_NotTerm(String regularName) {
         setRegularName_NotTerm(regularName, null);
     }
 
-    public void setRegularName_NotTerm(String regularName, ConditionOptionCall<NotQueryBuilder> opLambda) {
-        NotQueryBuilder builder = QueryBuilders.notQuery(regTermQ("regularName", regularName));
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
+    public void setRegularName_NotEqual(String regularName, ConditionOptionCall<BoolQueryBuilder> opLambda) {
+        setRegularName_NotTerm(regularName, opLambda);
+    }
+
+    public void setRegularName_NotTerm(String regularName, ConditionOptionCall<BoolQueryBuilder> opLambda) {
+        not(not -> not.setRegularName_Term(regularName), opLambda);
     }
 
     public void setRegularName_Terms(Collection<String> regularNameList) {
@@ -851,19 +822,16 @@ public abstract class BsDuplicateHostCQ extends EsAbstractConditionQuery {
         setSortOrder_NotTerm(sortOrder, null);
     }
 
-    public void setSortOrder_NotEqual(Integer sortOrder, ConditionOptionCall<NotQueryBuilder> opLambda) {
-        setSortOrder_NotTerm(sortOrder, opLambda);
-    }
-
     public void setSortOrder_NotTerm(Integer sortOrder) {
         setSortOrder_NotTerm(sortOrder, null);
     }
 
-    public void setSortOrder_NotTerm(Integer sortOrder, ConditionOptionCall<NotQueryBuilder> opLambda) {
-        NotQueryBuilder builder = QueryBuilders.notQuery(regTermQ("sortOrder", sortOrder));
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
+    public void setSortOrder_NotEqual(Integer sortOrder, ConditionOptionCall<BoolQueryBuilder> opLambda) {
+        setSortOrder_NotTerm(sortOrder, opLambda);
+    }
+
+    public void setSortOrder_NotTerm(Integer sortOrder, ConditionOptionCall<BoolQueryBuilder> opLambda) {
+        not(not -> not.setSortOrder_Term(sortOrder), opLambda);
     }
 
     public void setSortOrder_Terms(Collection<Integer> sortOrderList) {
@@ -1006,19 +974,16 @@ public abstract class BsDuplicateHostCQ extends EsAbstractConditionQuery {
         setUpdatedBy_NotTerm(updatedBy, null);
     }
 
-    public void setUpdatedBy_NotEqual(String updatedBy, ConditionOptionCall<NotQueryBuilder> opLambda) {
-        setUpdatedBy_NotTerm(updatedBy, opLambda);
-    }
-
     public void setUpdatedBy_NotTerm(String updatedBy) {
         setUpdatedBy_NotTerm(updatedBy, null);
     }
 
-    public void setUpdatedBy_NotTerm(String updatedBy, ConditionOptionCall<NotQueryBuilder> opLambda) {
-        NotQueryBuilder builder = QueryBuilders.notQuery(regTermQ("updatedBy", updatedBy));
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
+    public void setUpdatedBy_NotEqual(String updatedBy, ConditionOptionCall<BoolQueryBuilder> opLambda) {
+        setUpdatedBy_NotTerm(updatedBy, opLambda);
+    }
+
+    public void setUpdatedBy_NotTerm(String updatedBy, ConditionOptionCall<BoolQueryBuilder> opLambda) {
+        not(not -> not.setUpdatedBy_Term(updatedBy), opLambda);
     }
 
     public void setUpdatedBy_Terms(Collection<String> updatedByList) {
@@ -1172,19 +1137,16 @@ public abstract class BsDuplicateHostCQ extends EsAbstractConditionQuery {
         setUpdatedTime_NotTerm(updatedTime, null);
     }
 
-    public void setUpdatedTime_NotEqual(Long updatedTime, ConditionOptionCall<NotQueryBuilder> opLambda) {
-        setUpdatedTime_NotTerm(updatedTime, opLambda);
-    }
-
     public void setUpdatedTime_NotTerm(Long updatedTime) {
         setUpdatedTime_NotTerm(updatedTime, null);
     }
 
-    public void setUpdatedTime_NotTerm(Long updatedTime, ConditionOptionCall<NotQueryBuilder> opLambda) {
-        NotQueryBuilder builder = QueryBuilders.notQuery(regTermQ("updatedTime", updatedTime));
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
+    public void setUpdatedTime_NotEqual(Long updatedTime, ConditionOptionCall<BoolQueryBuilder> opLambda) {
+        setUpdatedTime_NotTerm(updatedTime, opLambda);
+    }
+
+    public void setUpdatedTime_NotTerm(Long updatedTime, ConditionOptionCall<BoolQueryBuilder> opLambda) {
+        not(not -> not.setUpdatedTime_Term(updatedTime), opLambda);
     }
 
     public void setUpdatedTime_Terms(Collection<Long> updatedTimeList) {

src/main/java/org/codelibs/fess/es/config/cbean/cq/bs/BsElevateWordCQ.java

@@ -21,14 +21,11 @@ import java.util.Collection;
 import org.codelibs.fess.es.config.allcommon.EsAbstractConditionQuery;
 import org.codelibs.fess.es.config.cbean.cq.ElevateWordCQ;
 import org.dbflute.cbean.ckey.ConditionKey;
-import org.dbflute.exception.IllegalConditionBeanOperationException;
 import org.elasticsearch.index.query.BoolQueryBuilder;
 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;
@@ -70,19 +67,8 @@ public abstract class BsElevateWordCQ extends EsAbstractConditionQuery {
         not(notLambda, null);
     }
 
-    public void not(OperatorCall<ElevateWordCQ> notLambda, ConditionOptionCall<NotQueryBuilder> opLambda) {
-        ElevateWordCQ notQuery = new ElevateWordCQ();
-        notLambda.callback(notQuery);
-        if (notQuery.hasQueries()) {
-            if (notQuery.getQueryBuilderList().size() > 1) {
-                final String msg = "not query must be one query.";
-                throw new IllegalConditionBeanOperationException(msg);
-            }
-            NotQueryBuilder builder = QueryBuilders.notQuery(notQuery.getQueryBuilderList().get(0));
-            if (opLambda != null) {
-                opLambda.callback(builder);
-            }
-        }
+    public void not(final OperatorCall<ElevateWordCQ> notLambda, final ConditionOptionCall<BoolQueryBuilder> opLambda) {
+        bool((must, should, mustNot, filter) -> notLambda.callback(mustNot), opLambda);
     }
 
     public void bool(BoolCall<ElevateWordCQ> boolLambda) {
@@ -131,19 +117,16 @@ public abstract class BsElevateWordCQ extends EsAbstractConditionQuery {
         setId_NotTerm(id, null);
     }
 
-    public void setId_NotEqual(String id, ConditionOptionCall<NotQueryBuilder> opLambda) {
-        setId_NotTerm(id, opLambda);
-    }
-
     public void setId_NotTerm(String id) {
         setId_NotTerm(id, null);
     }
 
-    public void setId_NotTerm(String id, ConditionOptionCall<NotQueryBuilder> opLambda) {
-        NotQueryBuilder builder = QueryBuilders.notQuery(regTermQ("_id", id));
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
+    public void setId_NotEqual(String id, ConditionOptionCall<BoolQueryBuilder> opLambda) {
+        setId_NotTerm(id, opLambda);
+    }
+
+    public void setId_NotTerm(String id, ConditionOptionCall<BoolQueryBuilder> opLambda) {
+        not(not -> not.setId_Term(id), opLambda);
     }
 
     public void setId_Terms(Collection<String> idList) {
@@ -198,19 +181,16 @@ public abstract class BsElevateWordCQ extends EsAbstractConditionQuery {
         setBoost_NotTerm(boost, null);
     }
 
-    public void setBoost_NotEqual(Float boost, ConditionOptionCall<NotQueryBuilder> opLambda) {
-        setBoost_NotTerm(boost, opLambda);
-    }
-
     public void setBoost_NotTerm(Float boost) {
         setBoost_NotTerm(boost, null);
     }
 
-    public void setBoost_NotTerm(Float boost, ConditionOptionCall<NotQueryBuilder> opLambda) {
-        NotQueryBuilder builder = QueryBuilders.notQuery(regTermQ("boost", boost));
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
+    public void setBoost_NotEqual(Float boost, ConditionOptionCall<BoolQueryBuilder> opLambda) {
+        setBoost_NotTerm(boost, opLambda);
+    }
+
+    public void setBoost_NotTerm(Float boost, ConditionOptionCall<BoolQueryBuilder> opLambda) {
+        not(not -> not.setBoost_Term(boost), opLambda);
     }
 
     public void setBoost_Terms(Collection<Float> boostList) {
@@ -353,19 +333,16 @@ public abstract class BsElevateWordCQ extends EsAbstractConditionQuery {
         setCreatedBy_NotTerm(createdBy, null);
     }
 
-    public void setCreatedBy_NotEqual(String createdBy, ConditionOptionCall<NotQueryBuilder> opLambda) {
-        setCreatedBy_NotTerm(createdBy, opLambda);
-    }
-
     public void setCreatedBy_NotTerm(String createdBy) {
         setCreatedBy_NotTerm(createdBy, null);
     }
 
-    public void setCreatedBy_NotTerm(String createdBy, ConditionOptionCall<NotQueryBuilder> opLambda) {
-        NotQueryBuilder builder = QueryBuilders.notQuery(regTermQ("createdBy", createdBy));
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
+    public void setCreatedBy_NotEqual(String createdBy, ConditionOptionCall<BoolQueryBuilder> opLambda) {
+        setCreatedBy_NotTerm(createdBy, opLambda);
+    }
+
+    public void setCreatedBy_NotTerm(String createdBy, ConditionOptionCall<BoolQueryBuilder> opLambda) {
+        not(not -> not.setCreatedBy_Term(createdBy), opLambda);
     }
 
     public void setCreatedBy_Terms(Collection<String> createdByList) {
@@ -519,19 +496,16 @@ public abstract class BsElevateWordCQ extends EsAbstractConditionQuery {
         setCreatedTime_NotTerm(createdTime, null);
     }
 
-    public void setCreatedTime_NotEqual(Long createdTime, ConditionOptionCall<NotQueryBuilder> opLambda) {
-        setCreatedTime_NotTerm(createdTime, opLambda);
-    }
-
     public void setCreatedTime_NotTerm(Long createdTime) {
         setCreatedTime_NotTerm(createdTime, null);
     }
 
-    public void setCreatedTime_NotTerm(Long createdTime, ConditionOptionCall<NotQueryBuilder> opLambda) {
-        NotQueryBuilder builder = QueryBuilders.notQuery(regTermQ("createdTime", createdTime));
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
+    public void setCreatedTime_NotEqual(Long createdTime, ConditionOptionCall<BoolQueryBuilder> opLambda) {
+        setCreatedTime_NotTerm(createdTime, opLambda);
+    }
+
+    public void setCreatedTime_NotTerm(Long createdTime, ConditionOptionCall<BoolQueryBuilder> opLambda) {
+        not(not -> not.setCreatedTime_Term(createdTime), opLambda);
     }
 
     public void setCreatedTime_Terms(Collection<Long> createdTimeList) {
@@ -674,19 +648,16 @@ public abstract class BsElevateWordCQ extends EsAbstractConditionQuery {
         setReading_NotTerm(reading, null);
     }
 
-    public void setReading_NotEqual(String reading, ConditionOptionCall<NotQueryBuilder> opLambda) {
-        setReading_NotTerm(reading, opLambda);
-    }
-
     public void setReading_NotTerm(String reading) {
         setReading_NotTerm(reading, null);
     }
 
-    public void setReading_NotTerm(String reading, ConditionOptionCall<NotQueryBuilder> opLambda) {
-        NotQueryBuilder builder = QueryBuilders.notQuery(regTermQ("reading", reading));
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
+    public void setReading_NotEqual(String reading, ConditionOptionCall<BoolQueryBuilder> opLambda) {
+        setReading_NotTerm(reading, opLambda);
+    }
+
+    public void setReading_NotTerm(String reading, ConditionOptionCall<BoolQueryBuilder> opLambda) {
+        not(not -> not.setReading_Term(reading), opLambda);
     }
 
     public void setReading_Terms(Collection<String> readingList) {
@@ -840,19 +811,16 @@ public abstract class BsElevateWordCQ extends EsAbstractConditionQuery {
         setSuggestWord_NotTerm(suggestWord, null);
     }
 
-    public void setSuggestWord_NotEqual(String suggestWord, ConditionOptionCall<NotQueryBuilder> opLambda) {
-        setSuggestWord_NotTerm(suggestWord, opLambda);
-    }
-
     public void setSuggestWord_NotTerm(String suggestWord) {
         setSuggestWord_NotTerm(suggestWord, null);
     }
 
-    public void setSuggestWord_NotTerm(String suggestWord, ConditionOptionCall<NotQueryBuilder> opLambda) {
-        NotQueryBuilder builder = QueryBuilders.notQuery(regTermQ("suggestWord", suggestWord));
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
+    public void setSuggestWord_NotEqual(String suggestWord, ConditionOptionCall<BoolQueryBuilder> opLambda) {
+        setSuggestWord_NotTerm(suggestWord, opLambda);
+    }
+
+    public void setSuggestWord_NotTerm(String suggestWord, ConditionOptionCall<BoolQueryBuilder> opLambda) {
+        not(not -> not.setSuggestWord_Term(suggestWord), opLambda);
     }
 
     public void setSuggestWord_Terms(Collection<String> suggestWordList) {
@@ -1006,19 +974,16 @@ public abstract class BsElevateWordCQ extends EsAbstractConditionQuery {
         setTargetLabel_NotTerm(targetLabel, null);
     }
 
-    public void setTargetLabel_NotEqual(String targetLabel, ConditionOptionCall<NotQueryBuilder> opLambda) {
-        setTargetLabel_NotTerm(targetLabel, opLambda);
-    }
-
     public void setTargetLabel_NotTerm(String targetLabel) {
         setTargetLabel_NotTerm(targetLabel, null);
     }
 
-    public void setTargetLabel_NotTerm(String targetLabel, ConditionOptionCall<NotQueryBuilder> opLambda) {
-        NotQueryBuilder builder = QueryBuilders.notQuery(regTermQ("targetLabel", targetLabel));
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
+    public void setTargetLabel_NotEqual(String targetLabel, ConditionOptionCall<BoolQueryBuilder> opLambda) {
+        setTargetLabel_NotTerm(targetLabel, opLambda);
+    }
+
+    public void setTargetLabel_NotTerm(String targetLabel, ConditionOptionCall<BoolQueryBuilder> opLambda) {
+        not(not -> not.setTargetLabel_Term(targetLabel), opLambda);
     }
 
     public void setTargetLabel_Terms(Collection<String> targetLabelList) {
@@ -1172,19 +1137,16 @@ public abstract class BsElevateWordCQ extends EsAbstractConditionQuery {
         setTargetRole_NotTerm(targetRole, null);
     }
 
-    public void setTargetRole_NotEqual(String targetRole, ConditionOptionCall<NotQueryBuilder> opLambda) {
-        setTargetRole_NotTerm(targetRole, opLambda);
-    }
-
     public void setTargetRole_NotTerm(String targetRole) {
         setTargetRole_NotTerm(targetRole, null);
     }
 
-    public void setTargetRole_NotTerm(String targetRole, ConditionOptionCall<NotQueryBuilder> opLambda) {
-        NotQueryBuilder builder = QueryBuilders.notQuery(regTermQ("targetRole", targetRole));
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
+    public void setTargetRole_NotEqual(String targetRole, ConditionOptionCall<BoolQueryBuilder> opLambda) {
+        setTargetRole_NotTerm(targetRole, opLambda);
+    }
+
+    public void setTargetRole_NotTerm(String targetRole, ConditionOptionCall<BoolQueryBuilder> opLambda) {
+        not(not -> not.setTargetRole_Term(targetRole), opLambda);
     }
 
     public void setTargetRole_Terms(Collection<String> targetRoleList) {
@@ -1338,19 +1300,16 @@ public abstract class BsElevateWordCQ extends EsAbstractConditionQuery {
         setPermissions_NotTerm(permissions, null);
     }
 
-    public void setPermissions_NotEqual(String permissions, ConditionOptionCall<NotQueryBuilder> opLambda) {
-        setPermissions_NotTerm(permissions, opLambda);
-    }
-
     public void setPermissions_NotTerm(String permissions) {
         setPermissions_NotTerm(permissions, null);
     }
 
-    public void setPermissions_NotTerm(String permissions, ConditionOptionCall<NotQueryBuilder> opLambda) {
-        NotQueryBuilder builder = QueryBuilders.notQuery(regTermQ("permissions", permissions));
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
+    public void setPermissions_NotEqual(String permissions, ConditionOptionCall<BoolQueryBuilder> opLambda) {
+        setPermissions_NotTerm(permissions, opLambda);
+    }
+
+    public void setPermissions_NotTerm(String permissions, ConditionOptionCall<BoolQueryBuilder> opLambda) {
+        not(not -> not.setPermissions_Term(permissions), opLambda);
     }
 
     public void setPermissions_Terms(Collection<String> permissionsList) {
@@ -1504,19 +1463,16 @@ public abstract class BsElevateWordCQ extends EsAbstractConditionQuery {
         setUpdatedBy_NotTerm(updatedBy, null);
     }
 
-    public void setUpdatedBy_NotEqual(String updatedBy, ConditionOptionCall<NotQueryBuilder> opLambda) {
-        setUpdatedBy_NotTerm(updatedBy, opLambda);
-    }
-
     public void setUpdatedBy_NotTerm(String updatedBy) {
         setUpdatedBy_NotTerm(updatedBy, null);
     }
 
-    public void setUpdatedBy_NotTerm(String updatedBy, ConditionOptionCall<NotQueryBuilder> opLambda) {
-        NotQueryBuilder builder = QueryBuilders.notQuery(regTermQ("updatedBy", updatedBy));
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
+    public void setUpdatedBy_NotEqual(String updatedBy, ConditionOptionCall<BoolQueryBuilder> opLambda) {
+        setUpdatedBy_NotTerm(updatedBy, opLambda);
+    }
+
+    public void setUpdatedBy_NotTerm(String updatedBy, ConditionOptionCall<BoolQueryBuilder> opLambda) {
+        not(not -> not.setUpdatedBy_Term(updatedBy), opLambda);
     }
 
     public void setUpdatedBy_Terms(Collection<String> updatedByList) {
@@ -1670,19 +1626,16 @@ public abstract class BsElevateWordCQ extends EsAbstractConditionQuery {
         setUpdatedTime_NotTerm(updatedTime, null);
     }
 
-    public void setUpdatedTime_NotEqual(Long updatedTime, ConditionOptionCall<NotQueryBuilder> opLambda) {
-        setUpdatedTime_NotTerm(updatedTime, opLambda);
-    }
-
     public void setUpdatedTime_NotTerm(Long updatedTime) {
         setUpdatedTime_NotTerm(updatedTime, null);
     }
 
-    public void setUpdatedTime_NotTerm(Long updatedTime, ConditionOptionCall<NotQueryBuilder> opLambda) {
-        NotQueryBuilder builder = QueryBuilders.notQuery(regTermQ("updatedTime", updatedTime));
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
+    public void setUpdatedTime_NotEqual(Long updatedTime, ConditionOptionCall<BoolQueryBuilder> opLambda) {
+        setUpdatedTime_NotTerm(updatedTime, opLambda);
+    }
+
+    public void setUpdatedTime_NotTerm(Long updatedTime, ConditionOptionCall<BoolQueryBuilder> opLambda) {
+        not(not -> not.setUpdatedTime_Term(updatedTime), opLambda);
     }
 
     public void setUpdatedTime_Terms(Collection<Long> updatedTimeList) {

src/main/java/org/codelibs/fess/es/config/cbean/cq/bs/BsElevateWordToLabelCQ.java

@@ -21,14 +21,11 @@ import java.util.Collection;
 import org.codelibs.fess.es.config.allcommon.EsAbstractConditionQuery;
 import org.codelibs.fess.es.config.cbean.cq.ElevateWordToLabelCQ;
 import org.dbflute.cbean.ckey.ConditionKey;
-import org.dbflute.exception.IllegalConditionBeanOperationException;
 import org.elasticsearch.index.query.BoolQueryBuilder;
 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;
@@ -71,19 +68,8 @@ public abstract class BsElevateWordToLabelCQ extends EsAbstractConditionQuery {
         not(notLambda, null);
     }
 
-    public void not(OperatorCall<ElevateWordToLabelCQ> notLambda, ConditionOptionCall<NotQueryBuilder> opLambda) {
-        ElevateWordToLabelCQ notQuery = new ElevateWordToLabelCQ();
-        notLambda.callback(notQuery);
-        if (notQuery.hasQueries()) {
-            if (notQuery.getQueryBuilderList().size() > 1) {
-                final String msg = "not query must be one query.";
-                throw new IllegalConditionBeanOperationException(msg);
-            }
-            NotQueryBuilder builder = QueryBuilders.notQuery(notQuery.getQueryBuilderList().get(0));
-            if (opLambda != null) {
-                opLambda.callback(builder);
-            }
-        }
+    public void not(final OperatorCall<ElevateWordToLabelCQ> notLambda, final ConditionOptionCall<BoolQueryBuilder> opLambda) {
+        bool((must, should, mustNot, filter) -> notLambda.callback(mustNot), opLambda);
     }
 
     public void bool(BoolCall<ElevateWordToLabelCQ> boolLambda) {
@@ -132,19 +118,16 @@ public abstract class BsElevateWordToLabelCQ extends EsAbstractConditionQuery {
         setId_NotTerm(id, null);
     }
 
-    public void setId_NotEqual(String id, ConditionOptionCall<NotQueryBuilder> opLambda) {
-        setId_NotTerm(id, opLambda);
-    }
-
     public void setId_NotTerm(String id) {
         setId_NotTerm(id, null);
     }
 
-    public void setId_NotTerm(String id, ConditionOptionCall<NotQueryBuilder> opLambda) {
-        NotQueryBuilder builder = QueryBuilders.notQuery(regTermQ("_id", id));
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
+    public void setId_NotEqual(String id, ConditionOptionCall<BoolQueryBuilder> opLambda) {
+        setId_NotTerm(id, opLambda);
+    }
+
+    public void setId_NotTerm(String id, ConditionOptionCall<BoolQueryBuilder> opLambda) {
+        not(not -> not.setId_Term(id), opLambda);
     }
 
     public void setId_Terms(Collection<String> idList) {
@@ -199,19 +182,16 @@ public abstract class BsElevateWordToLabelCQ extends EsAbstractConditionQuery {
         setElevateWordId_NotTerm(elevateWordId, null);
     }
 
-    public void setElevateWordId_NotEqual(String elevateWordId, ConditionOptionCall<NotQueryBuilder> opLambda) {
-        setElevateWordId_NotTerm(elevateWordId, opLambda);
-    }
-
     public void setElevateWordId_NotTerm(String elevateWordId) {
         setElevateWordId_NotTerm(elevateWordId, null);
     }
 
-    public void setElevateWordId_NotTerm(String elevateWordId, ConditionOptionCall<NotQueryBuilder> opLambda) {
-        NotQueryBuilder builder = QueryBuilders.notQuery(regTermQ("elevateWordId", elevateWordId));
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
+    public void setElevateWordId_NotEqual(String elevateWordId, ConditionOptionCall<BoolQueryBuilder> opLambda) {
+        setElevateWordId_NotTerm(elevateWordId, opLambda);
+    }
+
+    public void setElevateWordId_NotTerm(String elevateWordId, ConditionOptionCall<BoolQueryBuilder> opLambda) {
+        not(not -> not.setElevateWordId_Term(elevateWordId), opLambda);
     }
 
     public void setElevateWordId_Terms(Collection<String> elevateWordIdList) {
@@ -365,19 +345,16 @@ public abstract class BsElevateWordToLabelCQ extends EsAbstractConditionQuery {
         setLabelTypeId_NotTerm(labelTypeId, null);
     }
 
-    public void setLabelTypeId_NotEqual(String labelTypeId, ConditionOptionCall<NotQueryBuilder> opLambda) {
-        setLabelTypeId_NotTerm(labelTypeId, opLambda);
-    }
-
     public void setLabelTypeId_NotTerm(String labelTypeId) {
         setLabelTypeId_NotTerm(labelTypeId, null);
     }
 
-    public void setLabelTypeId_NotTerm(String labelTypeId, ConditionOptionCall<NotQueryBuilder> opLambda) {
-        NotQueryBuilder builder = QueryBuilders.notQuery(regTermQ("labelTypeId", labelTypeId));
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
+    public void setLabelTypeId_NotEqual(String labelTypeId, ConditionOptionCall<BoolQueryBuilder> opLambda) {
+        setLabelTypeId_NotTerm(labelTypeId, opLambda);
+    }
+
+    public void setLabelTypeId_NotTerm(String labelTypeId, ConditionOptionCall<BoolQueryBuilder> opLambda) {
+        not(not -> not.setLabelTypeId_Term(labelTypeId), opLambda);
     }
 
     public void setLabelTypeId_Terms(Collection<String> labelTypeIdList) {

src/main/java/org/codelibs/fess/es/config/cbean/cq/bs/BsFailureUrlCQ.java

@@ -21,14 +21,11 @@ import java.util.Collection;
 import org.codelibs.fess.es.config.allcommon.EsAbstractConditionQuery;
 import org.codelibs.fess.es.config.cbean.cq.FailureUrlCQ;
 import org.dbflute.cbean.ckey.ConditionKey;
-import org.dbflute.exception.IllegalConditionBeanOperationException;
 import org.elasticsearch.index.query.BoolQueryBuilder;
 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;
@@ -70,19 +67,8 @@ public abstract class BsFailureUrlCQ extends EsAbstractConditionQuery {
         not(notLambda, null);
     }
 
-    public void not(OperatorCall<FailureUrlCQ> notLambda, ConditionOptionCall<NotQueryBuilder> opLambda) {
-        FailureUrlCQ notQuery = new FailureUrlCQ();
-        notLambda.callback(notQuery);
-        if (notQuery.hasQueries()) {
-            if (notQuery.getQueryBuilderList().size() > 1) {
-                final String msg = "not query must be one query.";
-                throw new IllegalConditionBeanOperationException(msg);
-            }
-            NotQueryBuilder builder = QueryBuilders.notQuery(notQuery.getQueryBuilderList().get(0));
-            if (opLambda != null) {
-                opLambda.callback(builder);
-            }
-        }
+    public void not(final OperatorCall<FailureUrlCQ> notLambda, final ConditionOptionCall<BoolQueryBuilder> opLambda) {
+        bool((must, should, mustNot, filter) -> notLambda.callback(mustNot), opLambda);
     }
 
     public void bool(BoolCall<FailureUrlCQ> boolLambda) {
@@ -131,19 +117,16 @@ public abstract class BsFailureUrlCQ extends EsAbstractConditionQuery {
         setId_NotTerm(id, null);
     }
 
-    public void setId_NotEqual(String id, ConditionOptionCall<NotQueryBuilder> opLambda) {
-        setId_NotTerm(id, opLambda);
-    }
-
     public void setId_NotTerm(String id) {
         setId_NotTerm(id, null);
     }
 
-    public void setId_NotTerm(String id, ConditionOptionCall<NotQueryBuilder> opLambda) {
-        NotQueryBuilder builder = QueryBuilders.notQuery(regTermQ("_id", id));
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
+    public void setId_NotEqual(String id, ConditionOptionCall<BoolQueryBuilder> opLambda) {
+        setId_NotTerm(id, opLambda);
+    }
+
+    public void setId_NotTerm(String id, ConditionOptionCall<BoolQueryBuilder> opLambda) {
+        not(not -> not.setId_Term(id), opLambda);
     }
 
     public void setId_Terms(Collection<String> idList) {
@@ -198,19 +181,16 @@ public abstract class BsFailureUrlCQ extends EsAbstractConditionQuery {
         setConfigId_NotTerm(configId, null);
     }
 
-    public void setConfigId_NotEqual(String configId, ConditionOptionCall<NotQueryBuilder> opLambda) {
-        setConfigId_NotTerm(configId, opLambda);
-    }
-
     public void setConfigId_NotTerm(String configId) {
         setConfigId_NotTerm(configId, null);
     }
 
-    public void setConfigId_NotTerm(String configId, ConditionOptionCall<NotQueryBuilder> opLambda) {
-        NotQueryBuilder builder = QueryBuilders.notQuery(regTermQ("configId", configId));
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
+    public void setConfigId_NotEqual(String configId, ConditionOptionCall<BoolQueryBuilder> opLambda) {
+        setConfigId_NotTerm(configId, opLambda);
+    }
+
+    public void setConfigId_NotTerm(String configId, ConditionOptionCall<BoolQueryBuilder> opLambda) {
+        not(not -> not.setConfigId_Term(configId), opLambda);
     }
 
     public void setConfigId_Terms(Collection<String> configIdList) {
@@ -364,19 +344,16 @@ public abstract class BsFailureUrlCQ extends EsAbstractConditionQuery {
         setErrorCount_NotTerm(errorCount, null);
     }
 
-    public void setErrorCount_NotEqual(Integer errorCount, ConditionOptionCall<NotQueryBuilder> opLambda) {
-        setErrorCount_NotTerm(errorCount, opLambda);
-    }
-
     public void setErrorCount_NotTerm(Integer errorCount) {
         setErrorCount_NotTerm(errorCount, null);
     }
 
-    public void setErrorCount_NotTerm(Integer errorCount, ConditionOptionCall<NotQueryBuilder> opLambda) {
-        NotQueryBuilder builder = QueryBuilders.notQuery(regTermQ("errorCount", errorCount));
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
+    public void setErrorCount_NotEqual(Integer errorCount, ConditionOptionCall<BoolQueryBuilder> opLambda) {
+        setErrorCount_NotTerm(errorCount, opLambda);
+    }
+
+    public void setErrorCount_NotTerm(Integer errorCount, ConditionOptionCall<BoolQueryBuilder> opLambda) {
+        not(not -> not.setErrorCount_Term(errorCount), opLambda);
     }
 
     public void setErrorCount_Terms(Collection<Integer> errorCountList) {
@@ -519,19 +496,16 @@ public abstract class BsFailureUrlCQ extends EsAbstractConditionQuery {
         setErrorLog_NotTerm(errorLog, null);
     }
 
-    public void setErrorLog_NotEqual(String errorLog, ConditionOptionCall<NotQueryBuilder> opLambda) {
-        setErrorLog_NotTerm(errorLog, opLambda);
-    }
-
     public void setErrorLog_NotTerm(String errorLog) {
         setErrorLog_NotTerm(errorLog, null);
     }
 
-    public void setErrorLog_NotTerm(String errorLog, ConditionOptionCall<NotQueryBuilder> opLambda) {
-        NotQueryBuilder builder = QueryBuilders.notQuery(regTermQ("errorLog", errorLog));
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
+    public void setErrorLog_NotEqual(String errorLog, ConditionOptionCall<BoolQueryBuilder> opLambda) {
+        setErrorLog_NotTerm(errorLog, opLambda);
+    }
+
+    public void setErrorLog_NotTerm(String errorLog, ConditionOptionCall<BoolQueryBuilder> opLambda) {
+        not(not -> not.setErrorLog_Term(errorLog), opLambda);
     }
 
     public void setErrorLog_Terms(Collection<String> errorLogList) {
@@ -685,19 +659,16 @@ public abstract class BsFailureUrlCQ extends EsAbstractConditionQuery {
         setErrorName_NotTerm(errorName, null);
     }
 
-    public void setErrorName_NotEqual(String errorName, ConditionOptionCall<NotQueryBuilder> opLambda) {
-        setErrorName_NotTerm(errorName, opLambda);
-    }
-
     public void setErrorName_NotTerm(String errorName) {
         setErrorName_NotTerm(errorName, null);
     }
 
-    public void setErrorName_NotTerm(String errorName, ConditionOptionCall<NotQueryBuilder> opLambda) {
-        NotQueryBuilder builder = QueryBuilders.notQuery(regTermQ("errorName", errorName));
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
+    public void setErrorName_NotEqual(String errorName, ConditionOptionCall<BoolQueryBuilder> opLambda) {
+        setErrorName_NotTerm(errorName, opLambda);
+    }
+
+    public void setErrorName_NotTerm(String errorName, ConditionOptionCall<BoolQueryBuilder> opLambda) {
+        not(not -> not.setErrorName_Term(errorName), opLambda);
     }
 
     public void setErrorName_Terms(Collection<String> errorNameList) {
@@ -851,19 +822,16 @@ public abstract class BsFailureUrlCQ extends EsAbstractConditionQuery {
         setLastAccessTime_NotTerm(lastAccessTime, null);
     }
 
-    public void setLastAccessTime_NotEqual(Long lastAccessTime, ConditionOptionCall<NotQueryBuilder> opLambda) {
-        setLastAccessTime_NotTerm(lastAccessTime, opLambda);
-    }
-
     public void setLastAccessTime_NotTerm(Long lastAccessTime) {
         setLastAccessTime_NotTerm(lastAccessTime, null);
     }
 
-    public void setLastAccessTime_NotTerm(Long lastAccessTime, ConditionOptionCall<NotQueryBuilder> opLambda) {
-        NotQueryBuilder builder = QueryBuilders.notQuery(regTermQ("lastAccessTime", lastAccessTime));
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
+    public void setLastAccessTime_NotEqual(Long lastAccessTime, ConditionOptionCall<BoolQueryBuilder> opLambda) {
+        setLastAccessTime_NotTerm(lastAccessTime, opLambda);
+    }
+
+    public void setLastAccessTime_NotTerm(Long lastAccessTime, ConditionOptionCall<BoolQueryBuilder> opLambda) {
+        not(not -> not.setLastAccessTime_Term(lastAccessTime), opLambda);
     }
 
     public void setLastAccessTime_Terms(Collection<Long> lastAccessTimeList) {
@@ -1006,19 +974,16 @@ public abstract class BsFailureUrlCQ extends EsAbstractConditionQuery {
         setThreadName_NotTerm(threadName, null);
     }
 
-    public void setThreadName_NotEqual(String threadName, ConditionOptionCall<NotQueryBuilder> opLambda) {
-        setThreadName_NotTerm(threadName, opLambda);
-    }
-
     public void setThreadName_NotTerm(String threadName) {
         setThreadName_NotTerm(threadName, null);
     }
 
-    public void setThreadName_NotTerm(String threadName, ConditionOptionCall<NotQueryBuilder> opLambda) {
-        NotQueryBuilder builder = QueryBuilders.notQuery(regTermQ("threadName", threadName));
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
+    public void setThreadName_NotEqual(String threadName, ConditionOptionCall<BoolQueryBuilder> opLambda) {
+        setThreadName_NotTerm(threadName, opLambda);
+    }
+
+    public void setThreadName_NotTerm(String threadName, ConditionOptionCall<BoolQueryBuilder> opLambda) {
+        not(not -> not.setThreadName_Term(threadName), opLambda);
     }
 
     public void setThreadName_Terms(Collection<String> threadNameList) {
@@ -1172,19 +1137,16 @@ public abstract class BsFailureUrlCQ extends EsAbstractConditionQuery {
         setUrl_NotTerm(url, null);
     }
 
-    public void setUrl_NotEqual(String url, ConditionOptionCall<NotQueryBuilder> opLambda) {
-        setUrl_NotTerm(url, opLambda);
-    }
-
     public void setUrl_NotTerm(String url) {
         setUrl_NotTerm(url, null);
     }
 
-    public void setUrl_NotTerm(String url, ConditionOptionCall<NotQueryBuilder> opLambda) {
-        NotQueryBuilder builder = QueryBuilders.notQuery(regTermQ("url", url));
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
+    public void setUrl_NotEqual(String url, ConditionOptionCall<BoolQueryBuilder> opLambda) {
+        setUrl_NotTerm(url, opLambda);
+    }
+
+    public void setUrl_NotTerm(String url, ConditionOptionCall<BoolQueryBuilder> opLambda) {
+        not(not -> not.setUrl_Term(url), opLambda);
     }
 
     public void setUrl_Terms(Collection<String> urlList) {

src/main/java/org/codelibs/fess/es/config/cbean/cq/bs/BsFileAuthenticationCQ.java

@@ -21,14 +21,11 @@ import java.util.Collection;
 import org.codelibs.fess.es.config.allcommon.EsAbstractConditionQuery;
 import org.codelibs.fess.es.config.cbean.cq.FileAuthenticationCQ;
 import org.dbflute.cbean.ckey.ConditionKey;
-import org.dbflute.exception.IllegalConditionBeanOperationException;
 import org.elasticsearch.index.query.BoolQueryBuilder;
 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;
@@ -71,19 +68,8 @@ public abstract class BsFileAuthenticationCQ extends EsAbstractConditionQuery {
         not(notLambda, null);
     }
 
-    public void not(OperatorCall<FileAuthenticationCQ> notLambda, ConditionOptionCall<NotQueryBuilder> opLambda) {
-        FileAuthenticationCQ notQuery = new FileAuthenticationCQ();
-        notLambda.callback(notQuery);
-        if (notQuery.hasQueries()) {
-            if (notQuery.getQueryBuilderList().size() > 1) {
-                final String msg = "not query must be one query.";
-                throw new IllegalConditionBeanOperationException(msg);
-            }
-            NotQueryBuilder builder = QueryBuilders.notQuery(notQuery.getQueryBuilderList().get(0));
-            if (opLambda != null) {
-                opLambda.callback(builder);
-            }
-        }
+    public void not(final OperatorCall<FileAuthenticationCQ> notLambda, final ConditionOptionCall<BoolQueryBuilder> opLambda) {
+        bool((must, should, mustNot, filter) -> notLambda.callback(mustNot), opLambda);
     }
 
     public void bool(BoolCall<FileAuthenticationCQ> boolLambda) {
@@ -132,19 +118,16 @@ public abstract class BsFileAuthenticationCQ extends EsAbstractConditionQuery {
         setId_NotTerm(id, null);
     }
 
-    public void setId_NotEqual(String id, ConditionOptionCall<NotQueryBuilder> opLambda) {
-        setId_NotTerm(id, opLambda);
-    }
-
     public void setId_NotTerm(String id) {
         setId_NotTerm(id, null);
     }
 
-    public void setId_NotTerm(String id, ConditionOptionCall<NotQueryBuilder> opLambda) {
-        NotQueryBuilder builder = QueryBuilders.notQuery(regTermQ("_id", id));
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
+    public void setId_NotEqual(String id, ConditionOptionCall<BoolQueryBuilder> opLambda) {
+        setId_NotTerm(id, opLambda);
+    }
+
+    public void setId_NotTerm(String id, ConditionOptionCall<BoolQueryBuilder> opLambda) {
+        not(not -> not.setId_Term(id), opLambda);
     }
 
     public void setId_Terms(Collection<String> idList) {
@@ -199,19 +182,16 @@ public abstract class BsFileAuthenticationCQ extends EsAbstractConditionQuery {
         setCreatedBy_NotTerm(createdBy, null);
     }
 
-    public void setCreatedBy_NotEqual(String createdBy, ConditionOptionCall<NotQueryBuilder> opLambda) {
-        setCreatedBy_NotTerm(createdBy, opLambda);
-    }
-
     public void setCreatedBy_NotTerm(String createdBy) {
         setCreatedBy_NotTerm(createdBy, null);
     }
 
-    public void setCreatedBy_NotTerm(String createdBy, ConditionOptionCall<NotQueryBuilder> opLambda) {
-        NotQueryBuilder builder = QueryBuilders.notQuery(regTermQ("createdBy", createdBy));
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
+    public void setCreatedBy_NotEqual(String createdBy, ConditionOptionCall<BoolQueryBuilder> opLambda) {
+        setCreatedBy_NotTerm(createdBy, opLambda);
+    }
+
+    public void setCreatedBy_NotTerm(String createdBy, ConditionOptionCall<BoolQueryBuilder> opLambda) {
+        not(not -> not.setCreatedBy_Term(createdBy), opLambda);
     }
 
     public void setCreatedBy_Terms(Collection<String> createdByList) {
@@ -365,19 +345,16 @@ public abstract class BsFileAuthenticationCQ extends EsAbstractConditionQuery {
         setCreatedTime_NotTerm(createdTime, null);
     }
 
-    public void setCreatedTime_NotEqual(Long createdTime, ConditionOptionCall<NotQueryBuilder> opLambda) {
-        setCreatedTime_NotTerm(createdTime, opLambda);
-    }
-
     public void setCreatedTime_NotTerm(Long createdTime) {
         setCreatedTime_NotTerm(createdTime, null);
     }
 
-    public void setCreatedTime_NotTerm(Long createdTime, ConditionOptionCall<NotQueryBuilder> opLambda) {
-        NotQueryBuilder builder = QueryBuilders.notQuery(regTermQ("createdTime", createdTime));
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
+    public void setCreatedTime_NotEqual(Long createdTime, ConditionOptionCall<BoolQueryBuilder> opLambda) {
+        setCreatedTime_NotTerm(createdTime, opLambda);
+    }
+
+    public void setCreatedTime_NotTerm(Long createdTime, ConditionOptionCall<BoolQueryBuilder> opLambda) {
+        not(not -> not.setCreatedTime_Term(createdTime), opLambda);
     }
 
     public void setCreatedTime_Terms(Collection<Long> createdTimeList) {
@@ -520,19 +497,16 @@ public abstract class BsFileAuthenticationCQ extends EsAbstractConditionQuery {
         setFileConfigId_NotTerm(fileConfigId, null);
     }
 
-    public void setFileConfigId_NotEqual(String fileConfigId, ConditionOptionCall<NotQueryBuilder> opLambda) {
-        setFileConfigId_NotTerm(fileConfigId, opLambda);
-    }
-
     public void setFileConfigId_NotTerm(String fileConfigId) {
         setFileConfigId_NotTerm(fileConfigId, null);
     }
 
-    public void setFileConfigId_NotTerm(String fileConfigId, ConditionOptionCall<NotQueryBuilder> opLambda) {
-        NotQueryBuilder builder = QueryBuilders.notQuery(regTermQ("fileConfigId", fileConfigId));
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
+    public void setFileConfigId_NotEqual(String fileConfigId, ConditionOptionCall<BoolQueryBuilder> opLambda) {
+        setFileConfigId_NotTerm(fileConfigId, opLambda);
+    }
+
+    public void setFileConfigId_NotTerm(String fileConfigId, ConditionOptionCall<BoolQueryBuilder> opLambda) {
+        not(not -> not.setFileConfigId_Term(fileConfigId), opLambda);
     }
 
     public void setFileConfigId_Terms(Collection<String> fileConfigIdList) {
@@ -686,19 +660,16 @@ public abstract class BsFileAuthenticationCQ extends EsAbstractConditionQuery {
         setHostname_NotTerm(hostname, null);
     }
 
-    public void setHostname_NotEqual(String hostname, ConditionOptionCall<NotQueryBuilder> opLambda) {
-        setHostname_NotTerm(hostname, opLambda);
-    }
-
     public void setHostname_NotTerm(String hostname) {
         setHostname_NotTerm(hostname, null);
     }
 
-    public void setHostname_NotTerm(String hostname, ConditionOptionCall<NotQueryBuilder> opLambda) {
-        NotQueryBuilder builder = QueryBuilders.notQuery(regTermQ("hostname", hostname));
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
+    public void setHostname_NotEqual(String hostname, ConditionOptionCall<BoolQueryBuilder> opLambda) {
+        setHostname_NotTerm(hostname, opLambda);
+    }
+
+    public void setHostname_NotTerm(String hostname, ConditionOptionCall<BoolQueryBuilder> opLambda) {
+        not(not -> not.setHostname_Term(hostname), opLambda);
     }
 
     public void setHostname_Terms(Collection<String> hostnameList) {
@@ -852,19 +823,16 @@ public abstract class BsFileAuthenticationCQ extends EsAbstractConditionQuery {
         setParameters_NotTerm(parameters, null);
     }
 
-    public void setParameters_NotEqual(String parameters, ConditionOptionCall<NotQueryBuilder> opLambda) {
-        setParameters_NotTerm(parameters, opLambda);
-    }
-
     public void setParameters_NotTerm(String parameters) {
         setParameters_NotTerm(parameters, null);
     }
 
-    public void setParameters_NotTerm(String parameters, ConditionOptionCall<NotQueryBuilder> opLambda) {
-        NotQueryBuilder builder = QueryBuilders.notQuery(regTermQ("parameters", parameters));
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
+    public void setParameters_NotEqual(String parameters, ConditionOptionCall<BoolQueryBuilder> opLambda) {
+        setParameters_NotTerm(parameters, opLambda);
+    }
+
+    public void setParameters_NotTerm(String parameters, ConditionOptionCall<BoolQueryBuilder> opLambda) {
+        not(not -> not.setParameters_Term(parameters), opLambda);
     }
 
     public void setParameters_Terms(Collection<String> parametersList) {
@@ -1018,19 +986,16 @@ public abstract class BsFileAuthenticationCQ extends EsAbstractConditionQuery {
         setPassword_NotTerm(password, null);
     }
 
-    public void setPassword_NotEqual(String password, ConditionOptionCall<NotQueryBuilder> opLambda) {
-        setPassword_NotTerm(password, opLambda);
-    }
-
     public void setPassword_NotTerm(String password) {
         setPassword_NotTerm(password, null);
     }
 
-    public void setPassword_NotTerm(String password, ConditionOptionCall<NotQueryBuilder> opLambda) {
-        NotQueryBuilder builder = QueryBuilders.notQuery(regTermQ("password", password));
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
+    public void setPassword_NotEqual(String password, ConditionOptionCall<BoolQueryBuilder> opLambda) {
+        setPassword_NotTerm(password, opLambda);
+    }
+
+    public void setPassword_NotTerm(String password, ConditionOptionCall<BoolQueryBuilder> opLambda) {
+        not(not -> not.setPassword_Term(password), opLambda);
     }
 
     public void setPassword_Terms(Collection<String> passwordList) {
@@ -1184,19 +1149,16 @@ public abstract class BsFileAuthenticationCQ extends EsAbstractConditionQuery {
         setPort_NotTerm(port, null);
     }
 
-    public void setPort_NotEqual(Integer port, ConditionOptionCall<NotQueryBuilder> opLambda) {
-        setPort_NotTerm(port, opLambda);
-    }
-
     public void setPort_NotTerm(Integer port) {
         setPort_NotTerm(port, null);
     }
 
-    public void setPort_NotTerm(Integer port, ConditionOptionCall<NotQueryBuilder> opLambda) {
-        NotQueryBuilder builder = QueryBuilders.notQuery(regTermQ("port", port));
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
+    public void setPort_NotEqual(Integer port, ConditionOptionCall<BoolQueryBuilder> opLambda) {
+        setPort_NotTerm(port, opLambda);
+    }
+
+    public void setPort_NotTerm(Integer port, ConditionOptionCall<BoolQueryBuilder> opLambda) {
+        not(not -> not.setPort_Term(port), opLambda);
     }
 
     public void setPort_Terms(Collection<Integer> portList) {
@@ -1339,19 +1301,16 @@ public abstract class BsFileAuthenticationCQ extends EsAbstractConditionQuery {
         setProtocolScheme_NotTerm(protocolScheme, null);
     }
 
-    public void setProtocolScheme_NotEqual(String protocolScheme, ConditionOptionCall<NotQueryBuilder> opLambda) {
-        setProtocolScheme_NotTerm(protocolScheme, opLambda);
-    }
-
     public void setProtocolScheme_NotTerm(String protocolScheme) {
         setProtocolScheme_NotTerm(protocolScheme, null);
     }
 
-    public void setProtocolScheme_NotTerm(String protocolScheme, ConditionOptionCall<NotQueryBuilder> opLambda) {
-        NotQueryBuilder builder = QueryBuilders.notQuery(regTermQ("protocolScheme", protocolScheme));
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
+    public void setProtocolScheme_NotEqual(String protocolScheme, ConditionOptionCall<BoolQueryBuilder> opLambda) {
+        setProtocolScheme_NotTerm(protocolScheme, opLambda);
+    }
+
+    public void setProtocolScheme_NotTerm(String protocolScheme, ConditionOptionCall<BoolQueryBuilder> opLambda) {
+        not(not -> not.setProtocolScheme_Term(protocolScheme), opLambda);
     }
 
     public void setProtocolScheme_Terms(Collection<String> protocolSchemeList) {
@@ -1505,19 +1464,16 @@ public abstract class BsFileAuthenticationCQ extends EsAbstractConditionQuery {
         setUpdatedBy_NotTerm(updatedBy, null);
     }
 
-    public void setUpdatedBy_NotEqual(String updatedBy, ConditionOptionCall<NotQueryBuilder> opLambda) {
-        setUpdatedBy_NotTerm(updatedBy, opLambda);
-    }
-
     public void setUpdatedBy_NotTerm(String updatedBy) {
         setUpdatedBy_NotTerm(updatedBy, null);
     }
 
-    public void setUpdatedBy_NotTerm(String updatedBy, ConditionOptionCall<NotQueryBuilder> opLambda) {
-        NotQueryBuilder builder = QueryBuilders.notQuery(regTermQ("updatedBy", updatedBy));
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
+    public void setUpdatedBy_NotEqual(String updatedBy, ConditionOptionCall<BoolQueryBuilder> opLambda) {
+        setUpdatedBy_NotTerm(updatedBy, opLambda);
+    }
+
+    public void setUpdatedBy_NotTerm(String updatedBy, ConditionOptionCall<BoolQueryBuilder> opLambda) {
+        not(not -> not.setUpdatedBy_Term(updatedBy), opLambda);
     }
 
     public void setUpdatedBy_Terms(Collection<String> updatedByList) {
@@ -1671,19 +1627,16 @@ public abstract class BsFileAuthenticationCQ extends EsAbstractConditionQuery {
         setUpdatedTime_NotTerm(updatedTime, null);
     }
 
-    public void setUpdatedTime_NotEqual(Long updatedTime, ConditionOptionCall<NotQueryBuilder> opLambda) {
-        setUpdatedTime_NotTerm(updatedTime, opLambda);
-    }
-
     public void setUpdatedTime_NotTerm(Long updatedTime) {
         setUpdatedTime_NotTerm(updatedTime, null);
     }
 
-    public void setUpdatedTime_NotTerm(Long updatedTime, ConditionOptionCall<NotQueryBuilder> opLambda) {
-        NotQueryBuilder builder = QueryBuilders.notQuery(regTermQ("updatedTime", updatedTime));
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
+    public void setUpdatedTime_NotEqual(Long updatedTime, ConditionOptionCall<BoolQueryBuilder> opLambda) {
+        setUpdatedTime_NotTerm(updatedTime, opLambda);
+    }
+
+    public void setUpdatedTime_NotTerm(Long updatedTime, ConditionOptionCall<BoolQueryBuilder> opLambda) {
+        not(not -> not.setUpdatedTime_Term(updatedTime), opLambda);
     }
 
     public void setUpdatedTime_Terms(Collection<Long> updatedTimeList) {
@@ -1826,19 +1779,16 @@ public abstract class BsFileAuthenticationCQ extends EsAbstractConditionQuery {
         setUsername_NotTerm(username, null);
     }
 
-    public void setUsername_NotEqual(String username, ConditionOptionCall<NotQueryBuilder> opLambda) {
-        setUsername_NotTerm(username, opLambda);
-    }
-
     public void setUsername_NotTerm(String username) {
         setUsername_NotTerm(username, null);
     }
 
-    public void setUsername_NotTerm(String username, ConditionOptionCall<NotQueryBuilder> opLambda) {
-        NotQueryBuilder builder = QueryBuilders.notQuery(regTermQ("username", username));
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
+    public void setUsername_NotEqual(String username, ConditionOptionCall<BoolQueryBuilder> opLambda) {
+        setUsername_NotTerm(username, opLambda);
+    }
+
+    public void setUsername_NotTerm(String username, ConditionOptionCall<BoolQueryBuilder> opLambda) {
+        not(not -> not.setUsername_Term(username), opLambda);
     }
 
     public void setUsername_Terms(Collection<String> usernameList) {

src/main/java/org/codelibs/fess/es/config/cbean/cq/bs/BsFileConfigCQ.java

@@ -21,14 +21,11 @@ import java.util.Collection;
 import org.codelibs.fess.es.config.allcommon.EsAbstractConditionQuery;
 import org.codelibs.fess.es.config.cbean.cq.FileConfigCQ;
 import org.dbflute.cbean.ckey.ConditionKey;
-import org.dbflute.exception.IllegalConditionBeanOperationException;
 import org.elasticsearch.index.query.BoolQueryBuilder;
 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;
@@ -70,19 +67,8 @@ public abstract class BsFileConfigCQ extends EsAbstractConditionQuery {
         not(notLambda, null);
     }
 
-    public void not(OperatorCall<FileConfigCQ> notLambda, ConditionOptionCall<NotQueryBuilder> opLambda) {
-        FileConfigCQ notQuery = new FileConfigCQ();
-        notLambda.callback(notQuery);
-        if (notQuery.hasQueries()) {
-            if (notQuery.getQueryBuilderList().size() > 1) {
-                final String msg = "not query must be one query.";
-                throw new IllegalConditionBeanOperationException(msg);
-            }
-            NotQueryBuilder builder = QueryBuilders.notQuery(notQuery.getQueryBuilderList().get(0));
-            if (opLambda != null) {
-                opLambda.callback(builder);
-            }
-        }
+    public void not(final OperatorCall<FileConfigCQ> notLambda, final ConditionOptionCall<BoolQueryBuilder> opLambda) {
+        bool((must, should, mustNot, filter) -> notLambda.callback(mustNot), opLambda);
     }
 
     public void bool(BoolCall<FileConfigCQ> boolLambda) {
@@ -131,19 +117,16 @@ public abstract class BsFileConfigCQ extends EsAbstractConditionQuery {
         setId_NotTerm(id, null);
     }
 
-    public void setId_NotEqual(String id, ConditionOptionCall<NotQueryBuilder> opLambda) {
-        setId_NotTerm(id, opLambda);
-    }
-
     public void setId_NotTerm(String id) {
         setId_NotTerm(id, null);
     }
 
-    public void setId_NotTerm(String id, ConditionOptionCall<NotQueryBuilder> opLambda) {
-        NotQueryBuilder builder = QueryBuilders.notQuery(regTermQ("_id", id));
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
+    public void setId_NotEqual(String id, ConditionOptionCall<BoolQueryBuilder> opLambda) {
+        setId_NotTerm(id, opLambda);
+    }
+
+    public void setId_NotTerm(String id, ConditionOptionCall<BoolQueryBuilder> opLambda) {
+        not(not -> not.setId_Term(id), opLambda);
     }
 
     public void setId_Terms(Collection<String> idList) {
@@ -198,19 +181,16 @@ public abstract class BsFileConfigCQ extends EsAbstractConditionQuery {
         setAvailable_NotTerm(available, null);
     }
 
-    public void setAvailable_NotEqual(Boolean available, ConditionOptionCall<NotQueryBuilder> opLambda) {
-        setAvailable_NotTerm(available, opLambda);
-    }
-
     public void setAvailable_NotTerm(Boolean available) {
         setAvailable_NotTerm(available, null);
     }
 
-    public void setAvailable_NotTerm(Boolean available, ConditionOptionCall<NotQueryBuilder> opLambda) {
-        NotQueryBuilder builder = QueryBuilders.notQuery(regTermQ("available", available));
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
+    public void setAvailable_NotEqual(Boolean available, ConditionOptionCall<BoolQueryBuilder> opLambda) {
+        setAvailable_NotTerm(available, opLambda);
+    }
+
+    public void setAvailable_NotTerm(Boolean available, ConditionOptionCall<BoolQueryBuilder> opLambda) {
+        not(not -> not.setAvailable_Term(available), opLambda);
     }
 
     public void setAvailable_Terms(Collection<Boolean> availableList) {
@@ -353,19 +333,16 @@ public abstract class BsFileConfigCQ extends EsAbstractConditionQuery {
         setBoost_NotTerm(boost, null);
     }
 
-    public void setBoost_NotEqual(Float boost, ConditionOptionCall<NotQueryBuilder> opLambda) {
-        setBoost_NotTerm(boost, opLambda);
-    }
-
     public void setBoost_NotTerm(Float boost) {
         setBoost_NotTerm(boost, null);
     }
 
-    public void setBoost_NotTerm(Float boost, ConditionOptionCall<NotQueryBuilder> opLambda) {
-        NotQueryBuilder builder = QueryBuilders.notQuery(regTermQ("boost", boost));
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
+    public void setBoost_NotEqual(Float boost, ConditionOptionCall<BoolQueryBuilder> opLambda) {
+        setBoost_NotTerm(boost, opLambda);
+    }
+
+    public void setBoost_NotTerm(Float boost, ConditionOptionCall<BoolQueryBuilder> opLambda) {
+        not(not -> not.setBoost_Term(boost), opLambda);
     }
 
     public void setBoost_Terms(Collection<Float> boostList) {
@@ -508,19 +485,16 @@ public abstract class BsFileConfigCQ extends EsAbstractConditionQuery {
         setConfigParameter_NotTerm(configParameter, null);
     }
 
-    public void setConfigParameter_NotEqual(String configParameter, ConditionOptionCall<NotQueryBuilder> opLambda) {
-        setConfigParameter_NotTerm(configParameter, opLambda);
-    }
-
     public void setConfigParameter_NotTerm(String configParameter) {
         setConfigParameter_NotTerm(configParameter, null);
     }
 
-    public void setConfigParameter_NotTerm(String configParameter, ConditionOptionCall<NotQueryBuilder> opLambda) {
-        NotQueryBuilder builder = QueryBuilders.notQuery(regTermQ("configParameter", configParameter));
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
+    public void setConfigParameter_NotEqual(String configParameter, ConditionOptionCall<BoolQueryBuilder> opLambda) {
+        setConfigParameter_NotTerm(configParameter, opLambda);
+    }
+
+    public void setConfigParameter_NotTerm(String configParameter, ConditionOptionCall<BoolQueryBuilder> opLambda) {
+        not(not -> not.setConfigParameter_Term(configParameter), opLambda);
     }
 
     public void setConfigParameter_Terms(Collection<String> configParameterList) {
@@ -674,19 +648,16 @@ public abstract class BsFileConfigCQ extends EsAbstractConditionQuery {
         setCreatedBy_NotTerm(createdBy, null);
     }
 
-    public void setCreatedBy_NotEqual(String createdBy, ConditionOptionCall<NotQueryBuilder> opLambda) {
-        setCreatedBy_NotTerm(createdBy, opLambda);
-    }
-
     public void setCreatedBy_NotTerm(String createdBy) {
         setCreatedBy_NotTerm(createdBy, null);
     }
 
-    public void setCreatedBy_NotTerm(String createdBy, ConditionOptionCall<NotQueryBuilder> opLambda) {
-        NotQueryBuilder builder = QueryBuilders.notQuery(regTermQ("createdBy", createdBy));
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
+    public void setCreatedBy_NotEqual(String createdBy, ConditionOptionCall<BoolQueryBuilder> opLambda) {
+        setCreatedBy_NotTerm(createdBy, opLambda);
+    }
+
+    public void setCreatedBy_NotTerm(String createdBy, ConditionOptionCall<BoolQueryBuilder> opLambda) {
+        not(not -> not.setCreatedBy_Term(createdBy), opLambda);
     }
 
     public void setCreatedBy_Terms(Collection<String> createdByList) {
@@ -840,19 +811,16 @@ public abstract class BsFileConfigCQ extends EsAbstractConditionQuery {
         setCreatedTime_NotTerm(createdTime, null);
     }
 
-    public void setCreatedTime_NotEqual(Long createdTime, ConditionOptionCall<NotQueryBuilder> opLambda) {
-        setCreatedTime_NotTerm(createdTime, opLambda);
-    }
-
     public void setCreatedTime_NotTerm(Long createdTime) {
         setCreatedTime_NotTerm(createdTime, null);
     }
 
-    public void setCreatedTime_NotTerm(Long createdTime, ConditionOptionCall<NotQueryBuilder> opLambda) {
-        NotQueryBuilder builder = QueryBuilders.notQuery(regTermQ("createdTime", createdTime));
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
+    public void setCreatedTime_NotEqual(Long createdTime, ConditionOptionCall<BoolQueryBuilder> opLambda) {
+        setCreatedTime_NotTerm(createdTime, opLambda);
+    }
+
+    public void setCreatedTime_NotTerm(Long createdTime, ConditionOptionCall<BoolQueryBuilder> opLambda) {
+        not(not -> not.setCreatedTime_Term(createdTime), opLambda);
     }
 
     public void setCreatedTime_Terms(Collection<Long> createdTimeList) {
@@ -995,19 +963,16 @@ public abstract class BsFileConfigCQ extends EsAbstractConditionQuery {
         setDepth_NotTerm(depth, null);
     }
 
-    public void setDepth_NotEqual(Integer depth, ConditionOptionCall<NotQueryBuilder> opLambda) {
-        setDepth_NotTerm(depth, opLambda);
-    }
-
     public void setDepth_NotTerm(Integer depth) {
         setDepth_NotTerm(depth, null);
     }
 
-    public void setDepth_NotTerm(Integer depth, ConditionOptionCall<NotQueryBuilder> opLambda) {
-        NotQueryBuilder builder = QueryBuilders.notQuery(regTermQ("depth", depth));
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
+    public void setDepth_NotEqual(Integer depth, ConditionOptionCall<BoolQueryBuilder> opLambda) {
+        setDepth_NotTerm(depth, opLambda);
+    }
+
+    public void setDepth_NotTerm(Integer depth, ConditionOptionCall<BoolQueryBuilder> opLambda) {
+        not(not -> not.setDepth_Term(depth), opLambda);
     }
 
     public void setDepth_Terms(Collection<Integer> depthList) {
@@ -1150,19 +1115,16 @@ public abstract class BsFileConfigCQ extends EsAbstractConditionQuery {
         setExcludedDocPaths_NotTerm(excludedDocPaths, null);
     }
 
-    public void setExcludedDocPaths_NotEqual(String excludedDocPaths, ConditionOptionCall<NotQueryBuilder> opLambda) {
-        setExcludedDocPaths_NotTerm(excludedDocPaths, opLambda);
-    }
-
     public void setExcludedDocPaths_NotTerm(String excludedDocPaths) {
         setExcludedDocPaths_NotTerm(excludedDocPaths, null);
     }
 
-    public void setExcludedDocPaths_NotTerm(String excludedDocPaths, ConditionOptionCall<NotQueryBuilder> opLambda) {
-        NotQueryBuilder builder = QueryBuilders.notQuery(regTermQ("excludedDocPaths", excludedDocPaths));
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
+    public void setExcludedDocPaths_NotEqual(String excludedDocPaths, ConditionOptionCall<BoolQueryBuilder> opLambda) {
+        setExcludedDocPaths_NotTerm(excludedDocPaths, opLambda);
+    }
+
+    public void setExcludedDocPaths_NotTerm(String excludedDocPaths, ConditionOptionCall<BoolQueryBuilder> opLambda) {
+        not(not -> not.setExcludedDocPaths_Term(excludedDocPaths), opLambda);
     }
 
     public void setExcludedDocPaths_Terms(Collection<String> excludedDocPathsList) {
@@ -1316,19 +1278,16 @@ public abstract class BsFileConfigCQ extends EsAbstractConditionQuery {
         setExcludedPaths_NotTerm(excludedPaths, null);
     }
 
-    public void setExcludedPaths_NotEqual(String excludedPaths, ConditionOptionCall<NotQueryBuilder> opLambda) {
-        setExcludedPaths_NotTerm(excludedPaths, opLambda);
-    }
-
     public void setExcludedPaths_NotTerm(String excludedPaths) {
         setExcludedPaths_NotTerm(excludedPaths, null);
     }
 
-    public void setExcludedPaths_NotTerm(String excludedPaths, ConditionOptionCall<NotQueryBuilder> opLambda) {
-        NotQueryBuilder builder = QueryBuilders.notQuery(regTermQ("excludedPaths", excludedPaths));
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
+    public void setExcludedPaths_NotEqual(String excludedPaths, ConditionOptionCall<BoolQueryBuilder> opLambda) {
+        setExcludedPaths_NotTerm(excludedPaths, opLambda);
+    }
+
+    public void setExcludedPaths_NotTerm(String excludedPaths, ConditionOptionCall<BoolQueryBuilder> opLambda) {
+        not(not -> not.setExcludedPaths_Term(excludedPaths), opLambda);
     }
 
     public void setExcludedPaths_Terms(Collection<String> excludedPathsList) {
@@ -1482,19 +1441,16 @@ public abstract class BsFileConfigCQ extends EsAbstractConditionQuery {
         setIncludedDocPaths_NotTerm(includedDocPaths, null);
     }
 
-    public void setIncludedDocPaths_NotEqual(String includedDocPaths, ConditionOptionCall<NotQueryBuilder> opLambda) {
-        setIncludedDocPaths_NotTerm(includedDocPaths, opLambda);
-    }
-
     public void setIncludedDocPaths_NotTerm(String includedDocPaths) {
         setIncludedDocPaths_NotTerm(includedDocPaths, null);
     }
 
-    public void setIncludedDocPaths_NotTerm(String includedDocPaths, ConditionOptionCall<NotQueryBuilder> opLambda) {
-        NotQueryBuilder builder = QueryBuilders.notQuery(regTermQ("includedDocPaths", includedDocPaths));
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
+    public void setIncludedDocPaths_NotEqual(String includedDocPaths, ConditionOptionCall<BoolQueryBuilder> opLambda) {
+        setIncludedDocPaths_NotTerm(includedDocPaths, opLambda);
+    }
+
+    public void setIncludedDocPaths_NotTerm(String includedDocPaths, ConditionOptionCall<BoolQueryBuilder> opLambda) {
+        not(not -> not.setIncludedDocPaths_Term(includedDocPaths), opLambda);
     }
 
     public void setIncludedDocPaths_Terms(Collection<String> includedDocPathsList) {
@@ -1648,19 +1604,16 @@ public abstract class BsFileConfigCQ extends EsAbstractConditionQuery {
         setIncludedPaths_NotTerm(includedPaths, null);
     }
 
-    public void setIncludedPaths_NotEqual(String includedPaths, ConditionOptionCall<NotQueryBuilder> opLambda) {
-        setIncludedPaths_NotTerm(includedPaths, opLambda);
-    }
-
     public void setIncludedPaths_NotTerm(String includedPaths) {
         setIncludedPaths_NotTerm(includedPaths, null);
     }
 
-    public void setIncludedPaths_NotTerm(String includedPaths, ConditionOptionCall<NotQueryBuilder> opLambda) {
-        NotQueryBuilder builder = QueryBuilders.notQuery(regTermQ("includedPaths", includedPaths));
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
+    public void setIncludedPaths_NotEqual(String includedPaths, ConditionOptionCall<BoolQueryBuilder> opLambda) {
+        setIncludedPaths_NotTerm(includedPaths, opLambda);
+    }
+
+    public void setIncludedPaths_NotTerm(String includedPaths, ConditionOptionCall<BoolQueryBuilder> opLambda) {
+        not(not -> not.setIncludedPaths_Term(includedPaths), opLambda);
     }
 
     public void setIncludedPaths_Terms(Collection<String> includedPathsList) {
@@ -1814,19 +1767,16 @@ public abstract class BsFileConfigCQ extends EsAbstractConditionQuery {
         setIntervalTime_NotTerm(intervalTime, null);
     }
 
-    public void setIntervalTime_NotEqual(Integer intervalTime, ConditionOptionCall<NotQueryBuilder> opLambda) {
-        setIntervalTime_NotTerm(intervalTime, opLambda);
-    }
-
     public void setIntervalTime_NotTerm(Integer intervalTime) {
         setIntervalTime_NotTerm(intervalTime, null);
     }
 
-    public void setIntervalTime_NotTerm(Integer intervalTime, ConditionOptionCall<NotQueryBuilder> opLambda) {
-        NotQueryBuilder builder = QueryBuilders.notQuery(regTermQ("intervalTime", intervalTime));
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
+    public void setIntervalTime_NotEqual(Integer intervalTime, ConditionOptionCall<BoolQueryBuilder> opLambda) {
+        setIntervalTime_NotTerm(intervalTime, opLambda);
+    }
+
+    public void setIntervalTime_NotTerm(Integer intervalTime, ConditionOptionCall<BoolQueryBuilder> opLambda) {
+        not(not -> not.setIntervalTime_Term(intervalTime), opLambda);
     }
 
     public void setIntervalTime_Terms(Collection<Integer> intervalTimeList) {
@@ -1969,19 +1919,16 @@ public abstract class BsFileConfigCQ extends EsAbstractConditionQuery {
         setTimeToLive_NotTerm(timeToLive, null);
     }
 
-    public void setTimeToLive_NotEqual(Integer timeToLive, ConditionOptionCall<NotQueryBuilder> opLambda) {
-        setTimeToLive_NotTerm(timeToLive, opLambda);
-    }
-
     public void setTimeToLive_NotTerm(Integer timeToLive) {
         setTimeToLive_NotTerm(timeToLive, null);
     }
 
-    public void setTimeToLive_NotTerm(Integer timeToLive, ConditionOptionCall<NotQueryBuilder> opLambda) {
-        NotQueryBuilder builder = QueryBuilders.notQuery(regTermQ("timeToLive", timeToLive));
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
+    public void setTimeToLive_NotEqual(Integer timeToLive, ConditionOptionCall<BoolQueryBuilder> opLambda) {
+        setTimeToLive_NotTerm(timeToLive, opLambda);
+    }
+
+    public void setTimeToLive_NotTerm(Integer timeToLive, ConditionOptionCall<BoolQueryBuilder> opLambda) {
+        not(not -> not.setTimeToLive_Term(timeToLive), opLambda);
     }
 
     public void setTimeToLive_Terms(Collection<Integer> timeToLiveList) {
@@ -2124,19 +2071,16 @@ public abstract class BsFileConfigCQ extends EsAbstractConditionQuery {
         setMaxAccessCount_NotTerm(maxAccessCount, null);
     }
 
-    public void setMaxAccessCount_NotEqual(Long maxAccessCount, ConditionOptionCall<NotQueryBuilder> opLambda) {
-        setMaxAccessCount_NotTerm(maxAccessCount, opLambda);
-    }
-
     public void setMaxAccessCount_NotTerm(Long maxAccessCount) {
         setMaxAccessCount_NotTerm(maxAccessCount, null);
     }
 
-    public void setMaxAccessCount_NotTerm(Long maxAccessCount, ConditionOptionCall<NotQueryBuilder> opLambda) {
-        NotQueryBuilder builder = QueryBuilders.notQuery(regTermQ("maxAccessCount", maxAccessCount));
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
+    public void setMaxAccessCount_NotEqual(Long maxAccessCount, ConditionOptionCall<BoolQueryBuilder> opLambda) {
+        setMaxAccessCount_NotTerm(maxAccessCount, opLambda);
+    }
+
+    public void setMaxAccessCount_NotTerm(Long maxAccessCount, ConditionOptionCall<BoolQueryBuilder> opLambda) {
+        not(not -> not.setMaxAccessCount_Term(maxAccessCount), opLambda);
     }
 
     public void setMaxAccessCount_Terms(Collection<Long> maxAccessCountList) {
@@ -2279,19 +2223,16 @@ public abstract class BsFileConfigCQ extends EsAbstractConditionQuery {
         setName_NotTerm(name, null);
     }
 
-    public void setName_NotEqual(String name, ConditionOptionCall<NotQueryBuilder> opLambda) {
-        setName_NotTerm(name, opLambda);
-    }
-
     public void setName_NotTerm(String name) {
         setName_NotTerm(name, null);
     }
 
-    public void setName_NotTerm(String name, ConditionOptionCall<NotQueryBuilder> opLambda) {
-        NotQueryBuilder builder = QueryBuilders.notQuery(regTermQ("name", name));
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
+    public void setName_NotEqual(String name, ConditionOptionCall<BoolQueryBuilder> opLambda) {
+        setName_NotTerm(name, opLambda);
+    }
+
+    public void setName_NotTerm(String name, ConditionOptionCall<BoolQueryBuilder> opLambda) {
+        not(not -> not.setName_Term(name), opLambda);
     }
 
     public void setName_Terms(Collection<String> nameList) {
@@ -2445,19 +2386,16 @@ public abstract class BsFileConfigCQ extends EsAbstractConditionQuery {
         setNumOfThread_NotTerm(numOfThread, null);
     }
 
-    public void setNumOfThread_NotEqual(Integer numOfThread, ConditionOptionCall<NotQueryBuilder> opLambda) {
-        setNumOfThread_NotTerm(numOfThread, opLambda);
-    }
-
     public void setNumOfThread_NotTerm(Integer numOfThread) {
         setNumOfThread_NotTerm(numOfThread, null);
     }
 
-    public void setNumOfThread_NotTerm(Integer numOfThread, ConditionOptionCall<NotQueryBuilder> opLambda) {
-        NotQueryBuilder builder = QueryBuilders.notQuery(regTermQ("numOfThread", numOfThread));
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
+    public void setNumOfThread_NotEqual(Integer numOfThread, ConditionOptionCall<BoolQueryBuilder> opLambda) {
+        setNumOfThread_NotTerm(numOfThread, opLambda);
+    }
+
+    public void setNumOfThread_NotTerm(Integer numOfThread, ConditionOptionCall<BoolQueryBuilder> opLambda) {
+        not(not -> not.setNumOfThread_Term(numOfThread), opLambda);
     }
 
     public void setNumOfThread_Terms(Collection<Integer> numOfThreadList) {
@@ -2600,19 +2538,16 @@ public abstract class BsFileConfigCQ extends EsAbstractConditionQuery {
         setPaths_NotTerm(paths, null);
     }
 
-    public void setPaths_NotEqual(String paths, ConditionOptionCall<NotQueryBuilder> opLambda) {
-        setPaths_NotTerm(paths, opLambda);
-    }
-
     public void setPaths_NotTerm(String paths) {
         setPaths_NotTerm(paths, null);
     }
 
-    public void setPaths_NotTerm(String paths, ConditionOptionCall<NotQueryBuilder> opLambda) {
-        NotQueryBuilder builder = QueryBuilders.notQuery(regTermQ("paths", paths));
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
+    public void setPaths_NotEqual(String paths, ConditionOptionCall<BoolQueryBuilder> opLambda) {
+        setPaths_NotTerm(paths, opLambda);
+    }
+
+    public void setPaths_NotTerm(String paths, ConditionOptionCall<BoolQueryBuilder> opLambda) {
+        not(not -> not.setPaths_Term(paths), opLambda);
     }
 
     public void setPaths_Terms(Collection<String> pathsList) {
@@ -2766,19 +2701,16 @@ public abstract class BsFileConfigCQ extends EsAbstractConditionQuery {
         setPermissions_NotTerm(permissions, null);
     }
 
-    public void setPermissions_NotEqual(String permissions, ConditionOptionCall<NotQueryBuilder> opLambda) {
-        setPermissions_NotTerm(permissions, opLambda);
-    }
-
     public void setPermissions_NotTerm(String permissions) {
         setPermissions_NotTerm(permissions, null);
     }
 
-    public void setPermissions_NotTerm(String permissions, ConditionOptionCall<NotQueryBuilder> opLambda) {
-        NotQueryBuilder builder = QueryBuilders.notQuery(regTermQ("permissions", permissions));
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
+    public void setPermissions_NotEqual(String permissions, ConditionOptionCall<BoolQueryBuilder> opLambda) {
+        setPermissions_NotTerm(permissions, opLambda);
+    }
+
+    public void setPermissions_NotTerm(String permissions, ConditionOptionCall<BoolQueryBuilder> opLambda) {
+        not(not -> not.setPermissions_Term(permissions), opLambda);
     }
 
     public void setPermissions_Terms(Collection<String> permissionsList) {
@@ -2932,19 +2864,16 @@ public abstract class BsFileConfigCQ extends EsAbstractConditionQuery {
         setSortOrder_NotTerm(sortOrder, null);
     }
 
-    public void setSortOrder_NotEqual(Integer sortOrder, ConditionOptionCall<NotQueryBuilder> opLambda) {
-        setSortOrder_NotTerm(sortOrder, opLambda);
-    }
-
     public void setSortOrder_NotTerm(Integer sortOrder) {
         setSortOrder_NotTerm(sortOrder, null);
     }
 
-    public void setSortOrder_NotTerm(Integer sortOrder, ConditionOptionCall<NotQueryBuilder> opLambda) {
-        NotQueryBuilder builder = QueryBuilders.notQuery(regTermQ("sortOrder", sortOrder));
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
+    public void setSortOrder_NotEqual(Integer sortOrder, ConditionOptionCall<BoolQueryBuilder> opLambda) {
+        setSortOrder_NotTerm(sortOrder, opLambda);
+    }
+
+    public void setSortOrder_NotTerm(Integer sortOrder, ConditionOptionCall<BoolQueryBuilder> opLambda) {
+        not(not -> not.setSortOrder_Term(sortOrder), opLambda);
     }
 
     public void setSortOrder_Terms(Collection<Integer> sortOrderList) {
@@ -3087,19 +3016,16 @@ public abstract class BsFileConfigCQ extends EsAbstractConditionQuery {
         setUpdatedBy_NotTerm(updatedBy, null);
     }
 
-    public void setUpdatedBy_NotEqual(String updatedBy, ConditionOptionCall<NotQueryBuilder> opLambda) {
-        setUpdatedBy_NotTerm(updatedBy, opLambda);
-    }
-
     public void setUpdatedBy_NotTerm(String updatedBy) {
         setUpdatedBy_NotTerm(updatedBy, null);
     }
 
-    public void setUpdatedBy_NotTerm(String updatedBy, ConditionOptionCall<NotQueryBuilder> opLambda) {
-        NotQueryBuilder builder = QueryBuilders.notQuery(regTermQ("updatedBy", updatedBy));
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
+    public void setUpdatedBy_NotEqual(String updatedBy, ConditionOptionCall<BoolQueryBuilder> opLambda) {
+        setUpdatedBy_NotTerm(updatedBy, opLambda);
+    }
+
+    public void setUpdatedBy_NotTerm(String updatedBy, ConditionOptionCall<BoolQueryBuilder> opLambda) {
+        not(not -> not.setUpdatedBy_Term(updatedBy), opLambda);
     }
 
     public void setUpdatedBy_Terms(Collection<String> updatedByList) {
@@ -3253,19 +3179,16 @@ public abstract class BsFileConfigCQ extends EsAbstractConditionQuery {
         setUpdatedTime_NotTerm(updatedTime, null);
     }
 
-    public void setUpdatedTime_NotEqual(Long updatedTime, ConditionOptionCall<NotQueryBuilder> opLambda) {
-        setUpdatedTime_NotTerm(updatedTime, opLambda);
-    }
-
     public void setUpdatedTime_NotTerm(Long updatedTime) {
         setUpdatedTime_NotTerm(updatedTime, null);
     }
 
-    public void setUpdatedTime_NotTerm(Long updatedTime, ConditionOptionCall<NotQueryBuilder> opLambda) {
-        NotQueryBuilder builder = QueryBuilders.notQuery(regTermQ("updatedTime", updatedTime));
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
+    public void setUpdatedTime_NotEqual(Long updatedTime, ConditionOptionCall<BoolQueryBuilder> opLambda) {
+        setUpdatedTime_NotTerm(updatedTime, opLambda);
+    }
+
+    public void setUpdatedTime_NotTerm(Long updatedTime, ConditionOptionCall<BoolQueryBuilder> opLambda) {
+        not(not -> not.setUpdatedTime_Term(updatedTime), opLambda);
     }
 
     public void setUpdatedTime_Terms(Collection<Long> updatedTimeList) {

src/main/java/org/codelibs/fess/es/config/cbean/cq/bs/BsFileConfigToLabelCQ.java

@@ -21,14 +21,11 @@ import java.util.Collection;
 import org.codelibs.fess.es.config.allcommon.EsAbstractConditionQuery;
 import org.codelibs.fess.es.config.cbean.cq.FileConfigToLabelCQ;
 import org.dbflute.cbean.ckey.ConditionKey;
-import org.dbflute.exception.IllegalConditionBeanOperationException;
 import org.elasticsearch.index.query.BoolQueryBuilder;
 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;
@@ -71,19 +68,8 @@ public abstract class BsFileConfigToLabelCQ extends EsAbstractConditionQuery {
         not(notLambda, null);
     }
 
-    public void not(OperatorCall<FileConfigToLabelCQ> notLambda, ConditionOptionCall<NotQueryBuilder> opLambda) {
-        FileConfigToLabelCQ notQuery = new FileConfigToLabelCQ();
-        notLambda.callback(notQuery);
-        if (notQuery.hasQueries()) {
-            if (notQuery.getQueryBuilderList().size() > 1) {
-                final String msg = "not query must be one query.";
-                throw new IllegalConditionBeanOperationException(msg);
-            }
-            NotQueryBuilder builder = QueryBuilders.notQuery(notQuery.getQueryBuilderList().get(0));
-            if (opLambda != null) {
-                opLambda.callback(builder);
-            }
-        }
+    public void not(final OperatorCall<FileConfigToLabelCQ> notLambda, final ConditionOptionCall<BoolQueryBuilder> opLambda) {
+        bool((must, should, mustNot, filter) -> notLambda.callback(mustNot), opLambda);
     }
 
     public void bool(BoolCall<FileConfigToLabelCQ> boolLambda) {
@@ -132,19 +118,16 @@ public abstract class BsFileConfigToLabelCQ extends EsAbstractConditionQuery {
         setId_NotTerm(id, null);
     }
 
-    public void setId_NotEqual(String id, ConditionOptionCall<NotQueryBuilder> opLambda) {
-        setId_NotTerm(id, opLambda);
-    }
-
     public void setId_NotTerm(String id) {
         setId_NotTerm(id, null);
     }
 
-    public void setId_NotTerm(String id, ConditionOptionCall<NotQueryBuilder> opLambda) {
-        NotQueryBuilder builder = QueryBuilders.notQuery(regTermQ("_id", id));
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
+    public void setId_NotEqual(String id, ConditionOptionCall<BoolQueryBuilder> opLambda) {
+        setId_NotTerm(id, opLambda);
+    }
+
+    public void setId_NotTerm(String id, ConditionOptionCall<BoolQueryBuilder> opLambda) {
+        not(not -> not.setId_Term(id), opLambda);
     }
 
     public void setId_Terms(Collection<String> idList) {
@@ -199,19 +182,16 @@ public abstract class BsFileConfigToLabelCQ extends EsAbstractConditionQuery {
         setFileConfigId_NotTerm(fileConfigId, null);
     }
 
-    public void setFileConfigId_NotEqual(String fileConfigId, ConditionOptionCall<NotQueryBuilder> opLambda) {
-        setFileConfigId_NotTerm(fileConfigId, opLambda);
-    }
-
     public void setFileConfigId_NotTerm(String fileConfigId) {
         setFileConfigId_NotTerm(fileConfigId, null);
     }
 
-    public void setFileConfigId_NotTerm(String fileConfigId, ConditionOptionCall<NotQueryBuilder> opLambda) {
-        NotQueryBuilder builder = QueryBuilders.notQuery(regTermQ("fileConfigId", fileConfigId));
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
+    public void setFileConfigId_NotEqual(String fileConfigId, ConditionOptionCall<BoolQueryBuilder> opLambda) {
+        setFileConfigId_NotTerm(fileConfigId, opLambda);
+    }
+
+    public void setFileConfigId_NotTerm(String fileConfigId, ConditionOptionCall<BoolQueryBuilder> opLambda) {
+        not(not -> not.setFileConfigId_Term(fileConfigId), opLambda);
     }
 
     public void setFileConfigId_Terms(Collection<String> fileConfigIdList) {
@@ -365,19 +345,16 @@ public abstract class BsFileConfigToLabelCQ extends EsAbstractConditionQuery {
         setLabelTypeId_NotTerm(labelTypeId, null);
     }
 
-    public void setLabelTypeId_NotEqual(String labelTypeId, ConditionOptionCall<NotQueryBuilder> opLambda) {
-        setLabelTypeId_NotTerm(labelTypeId, opLambda);
-    }
-
     public void setLabelTypeId_NotTerm(String labelTypeId) {
         setLabelTypeId_NotTerm(labelTypeId, null);
     }
 
-    public void setLabelTypeId_NotTerm(String labelTypeId, ConditionOptionCall<NotQueryBuilder> opLambda) {
-        NotQueryBuilder builder = QueryBuilders.notQuery(regTermQ("labelTypeId", labelTypeId));
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
+    public void setLabelTypeId_NotEqual(String labelTypeId, ConditionOptionCall<BoolQueryBuilder> opLambda) {
+        setLabelTypeId_NotTerm(labelTypeId, opLambda);
+    }
+
+    public void setLabelTypeId_NotTerm(String labelTypeId, ConditionOptionCall<BoolQueryBuilder> opLambda) {
+        not(not -> not.setLabelTypeId_Term(labelTypeId), opLambda);
     }
 
     public void setLabelTypeId_Terms(Collection<String> labelTypeIdList) {

src/main/java/org/codelibs/fess/es/config/cbean/cq/bs/BsFileConfigToRoleCQ.java

@@ -21,14 +21,11 @@ import java.util.Collection;
 import org.codelibs.fess.es.config.allcommon.EsAbstractConditionQuery;
 import org.codelibs.fess.es.config.cbean.cq.FileConfigToRoleCQ;
 import org.dbflute.cbean.ckey.ConditionKey;
-import org.dbflute.exception.IllegalConditionBeanOperationException;
 import org.elasticsearch.index.query.BoolQueryBuilder;
 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;
@@ -70,19 +67,8 @@ public abstract class BsFileConfigToRoleCQ extends EsAbstractConditionQuery {
         not(notLambda, null);
     }
 
-    public void not(OperatorCall<FileConfigToRoleCQ> notLambda, ConditionOptionCall<NotQueryBuilder> opLambda) {
-        FileConfigToRoleCQ notQuery = new FileConfigToRoleCQ();
-        notLambda.callback(notQuery);
-        if (notQuery.hasQueries()) {
-            if (notQuery.getQueryBuilderList().size() > 1) {
-                final String msg = "not query must be one query.";
-                throw new IllegalConditionBeanOperationException(msg);
-            }
-            NotQueryBuilder builder = QueryBuilders.notQuery(notQuery.getQueryBuilderList().get(0));
-            if (opLambda != null) {
-                opLambda.callback(builder);
-            }
-        }
+    public void not(final OperatorCall<FileConfigToRoleCQ> notLambda, final ConditionOptionCall<BoolQueryBuilder> opLambda) {
+        bool((must, should, mustNot, filter) -> notLambda.callback(mustNot), opLambda);
     }
 
     public void bool(BoolCall<FileConfigToRoleCQ> boolLambda) {
@@ -131,19 +117,16 @@ public abstract class BsFileConfigToRoleCQ extends EsAbstractConditionQuery {
         setId_NotTerm(id, null);
     }
 
-    public void setId_NotEqual(String id, ConditionOptionCall<NotQueryBuilder> opLambda) {
-        setId_NotTerm(id, opLambda);
-    }
-
     public void setId_NotTerm(String id) {
         setId_NotTerm(id, null);
     }
 
-    public void setId_NotTerm(String id, ConditionOptionCall<NotQueryBuilder> opLambda) {
-        NotQueryBuilder builder = QueryBuilders.notQuery(regTermQ("_id", id));
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
+    public void setId_NotEqual(String id, ConditionOptionCall<BoolQueryBuilder> opLambda) {
+        setId_NotTerm(id, opLambda);
+    }
+
+    public void setId_NotTerm(String id, ConditionOptionCall<BoolQueryBuilder> opLambda) {
+        not(not -> not.setId_Term(id), opLambda);
     }
 
     public void setId_Terms(Collection<String> idList) {
@@ -198,19 +181,16 @@ public abstract class BsFileConfigToRoleCQ extends EsAbstractConditionQuery {
         setFileConfigId_NotTerm(fileConfigId, null);
     }
 
-    public void setFileConfigId_NotEqual(String fileConfigId, ConditionOptionCall<NotQueryBuilder> opLambda) {
-        setFileConfigId_NotTerm(fileConfigId, opLambda);
-    }
-
     public void setFileConfigId_NotTerm(String fileConfigId) {
         setFileConfigId_NotTerm(fileConfigId, null);
     }
 
-    public void setFileConfigId_NotTerm(String fileConfigId, ConditionOptionCall<NotQueryBuilder> opLambda) {
-        NotQueryBuilder builder = QueryBuilders.notQuery(regTermQ("fileConfigId", fileConfigId));
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
+    public void setFileConfigId_NotEqual(String fileConfigId, ConditionOptionCall<BoolQueryBuilder> opLambda) {
+        setFileConfigId_NotTerm(fileConfigId, opLambda);
+    }
+
+    public void setFileConfigId_NotTerm(String fileConfigId, ConditionOptionCall<BoolQueryBuilder> opLambda) {
+        not(not -> not.setFileConfigId_Term(fileConfigId), opLambda);
     }
 
     public void setFileConfigId_Terms(Collection<String> fileConfigIdList) {
@@ -364,19 +344,16 @@ public abstract class BsFileConfigToRoleCQ extends EsAbstractConditionQuery {
         setRoleTypeId_NotTerm(roleTypeId, null);
     }
 
-    public void setRoleTypeId_NotEqual(String roleTypeId, ConditionOptionCall<NotQueryBuilder> opLambda) {
-        setRoleTypeId_NotTerm(roleTypeId, opLambda);
-    }
-
     public void setRoleTypeId_NotTerm(String roleTypeId) {
         setRoleTypeId_NotTerm(roleTypeId, null);
     }
 
-    public void setRoleTypeId_NotTerm(String roleTypeId, ConditionOptionCall<NotQueryBuilder> opLambda) {
-        NotQueryBuilder builder = QueryBuilders.notQuery(regTermQ("roleTypeId", roleTypeId));
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
+    public void setRoleTypeId_NotEqual(String roleTypeId, ConditionOptionCall<BoolQueryBuilder> opLambda) {
+        setRoleTypeId_NotTerm(roleTypeId, opLambda);
+    }
+
+    public void setRoleTypeId_NotTerm(String roleTypeId, ConditionOptionCall<BoolQueryBuilder> opLambda) {
+        not(not -> not.setRoleTypeId_Term(roleTypeId), opLambda);
     }
 
     public void setRoleTypeId_Terms(Collection<String> roleTypeIdList) {

src/main/java/org/codelibs/fess/es/config/cbean/cq/bs/BsJobLogCQ.java

@@ -21,14 +21,11 @@ import java.util.Collection;
 import org.codelibs.fess.es.config.allcommon.EsAbstractConditionQuery;
 import org.codelibs.fess.es.config.cbean.cq.JobLogCQ;
 import org.dbflute.cbean.ckey.ConditionKey;
-import org.dbflute.exception.IllegalConditionBeanOperationException;
 import org.elasticsearch.index.query.BoolQueryBuilder;
 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;
@@ -70,19 +67,8 @@ public abstract class BsJobLogCQ extends EsAbstractConditionQuery {
         not(notLambda, null);
     }
 
-    public void not(OperatorCall<JobLogCQ> notLambda, ConditionOptionCall<NotQueryBuilder> opLambda) {
-        JobLogCQ notQuery = new JobLogCQ();
-        notLambda.callback(notQuery);
-        if (notQuery.hasQueries()) {
-            if (notQuery.getQueryBuilderList().size() > 1) {
-                final String msg = "not query must be one query.";
-                throw new IllegalConditionBeanOperationException(msg);
-            }
-            NotQueryBuilder builder = QueryBuilders.notQuery(notQuery.getQueryBuilderList().get(0));
-            if (opLambda != null) {
-                opLambda.callback(builder);
-            }
-        }
+    public void not(final OperatorCall<JobLogCQ> notLambda, final ConditionOptionCall<BoolQueryBuilder> opLambda) {
+        bool((must, should, mustNot, filter) -> notLambda.callback(mustNot), opLambda);
     }
 
     public void bool(BoolCall<JobLogCQ> boolLambda) {
@@ -131,19 +117,16 @@ public abstract class BsJobLogCQ extends EsAbstractConditionQuery {
         setId_NotTerm(id, null);
     }
 
-    public void setId_NotEqual(String id, ConditionOptionCall<NotQueryBuilder> opLambda) {
-        setId_NotTerm(id, opLambda);
-    }
-
     public void setId_NotTerm(String id) {
         setId_NotTerm(id, null);
     }
 
-    public void setId_NotTerm(String id, ConditionOptionCall<NotQueryBuilder> opLambda) {
-        NotQueryBuilder builder = QueryBuilders.notQuery(regTermQ("_id", id));
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
+    public void setId_NotEqual(String id, ConditionOptionCall<BoolQueryBuilder> opLambda) {
+        setId_NotTerm(id, opLambda);
+    }
+
+    public void setId_NotTerm(String id, ConditionOptionCall<BoolQueryBuilder> opLambda) {
+        not(not -> not.setId_Term(id), opLambda);
     }
 
     public void setId_Terms(Collection<String> idList) {
@@ -198,19 +181,16 @@ public abstract class BsJobLogCQ extends EsAbstractConditionQuery {
         setEndTime_NotTerm(endTime, null);
     }
 
-    public void setEndTime_NotEqual(Long endTime, ConditionOptionCall<NotQueryBuilder> opLambda) {
-        setEndTime_NotTerm(endTime, opLambda);
-    }
-
     public void setEndTime_NotTerm(Long endTime) {
         setEndTime_NotTerm(endTime, null);
     }
 
-    public void setEndTime_NotTerm(Long endTime, ConditionOptionCall<NotQueryBuilder> opLambda) {
-        NotQueryBuilder builder = QueryBuilders.notQuery(regTermQ("endTime", endTime));
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
+    public void setEndTime_NotEqual(Long endTime, ConditionOptionCall<BoolQueryBuilder> opLambda) {
+        setEndTime_NotTerm(endTime, opLambda);
+    }
+
+    public void setEndTime_NotTerm(Long endTime, ConditionOptionCall<BoolQueryBuilder> opLambda) {
+        not(not -> not.setEndTime_Term(endTime), opLambda);
     }
 
     public void setEndTime_Terms(Collection<Long> endTimeList) {
@@ -353,19 +333,16 @@ public abstract class BsJobLogCQ extends EsAbstractConditionQuery {
         setJobName_NotTerm(jobName, null);
     }
 
-    public void setJobName_NotEqual(String jobName, ConditionOptionCall<NotQueryBuilder> opLambda) {
-        setJobName_NotTerm(jobName, opLambda);
-    }
-
     public void setJobName_NotTerm(String jobName) {
         setJobName_NotTerm(jobName, null);
     }
 
-    public void setJobName_NotTerm(String jobName, ConditionOptionCall<NotQueryBuilder> opLambda) {
-        NotQueryBuilder builder = QueryBuilders.notQuery(regTermQ("jobName", jobName));
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
+    public void setJobName_NotEqual(String jobName, ConditionOptionCall<BoolQueryBuilder> opLambda) {
+        setJobName_NotTerm(jobName, opLambda);
+    }
+
+    public void setJobName_NotTerm(String jobName, ConditionOptionCall<BoolQueryBuilder> opLambda) {
+        not(not -> not.setJobName_Term(jobName), opLambda);
     }
 
     public void setJobName_Terms(Collection<String> jobNameList) {
@@ -519,19 +496,16 @@ public abstract class BsJobLogCQ extends EsAbstractConditionQuery {
         setJobStatus_NotTerm(jobStatus, null);
     }
 
-    public void setJobStatus_NotEqual(String jobStatus, ConditionOptionCall<NotQueryBuilder> opLambda) {
-        setJobStatus_NotTerm(jobStatus, opLambda);
-    }
-
     public void setJobStatus_NotTerm(String jobStatus) {
         setJobStatus_NotTerm(jobStatus, null);
     }
 
-    public void setJobStatus_NotTerm(String jobStatus, ConditionOptionCall<NotQueryBuilder> opLambda) {
-        NotQueryBuilder builder = QueryBuilders.notQuery(regTermQ("jobStatus", jobStatus));
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
+    public void setJobStatus_NotEqual(String jobStatus, ConditionOptionCall<BoolQueryBuilder> opLambda) {
+        setJobStatus_NotTerm(jobStatus, opLambda);
+    }
+
+    public void setJobStatus_NotTerm(String jobStatus, ConditionOptionCall<BoolQueryBuilder> opLambda) {
+        not(not -> not.setJobStatus_Term(jobStatus), opLambda);
     }
 
     public void setJobStatus_Terms(Collection<String> jobStatusList) {
@@ -685,19 +659,16 @@ public abstract class BsJobLogCQ extends EsAbstractConditionQuery {
         setScriptData_NotTerm(scriptData, null);
     }
 
-    public void setScriptData_NotEqual(String scriptData, ConditionOptionCall<NotQueryBuilder> opLambda) {
-        setScriptData_NotTerm(scriptData, opLambda);
-    }
-
     public void setScriptData_NotTerm(String scriptData) {
         setScriptData_NotTerm(scriptData, null);
     }
 
-    public void setScriptData_NotTerm(String scriptData, ConditionOptionCall<NotQueryBuilder> opLambda) {
-        NotQueryBuilder builder = QueryBuilders.notQuery(regTermQ("scriptData", scriptData));
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
+    public void setScriptData_NotEqual(String scriptData, ConditionOptionCall<BoolQueryBuilder> opLambda) {
+        setScriptData_NotTerm(scriptData, opLambda);
+    }
+
+    public void setScriptData_NotTerm(String scriptData, ConditionOptionCall<BoolQueryBuilder> opLambda) {
+        not(not -> not.setScriptData_Term(scriptData), opLambda);
     }
 
     public void setScriptData_Terms(Collection<String> scriptDataList) {
@@ -851,19 +822,16 @@ public abstract class BsJobLogCQ extends EsAbstractConditionQuery {
         setScriptResult_NotTerm(scriptResult, null);
     }
 
-    public void setScriptResult_NotEqual(String scriptResult, ConditionOptionCall<NotQueryBuilder> opLambda) {
-        setScriptResult_NotTerm(scriptResult, opLambda);
-    }
-
     public void setScriptResult_NotTerm(String scriptResult) {
         setScriptResult_NotTerm(scriptResult, null);
     }
 
-    public void setScriptResult_NotTerm(String scriptResult, ConditionOptionCall<NotQueryBuilder> opLambda) {
-        NotQueryBuilder builder = QueryBuilders.notQuery(regTermQ("scriptResult", scriptResult));
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
+    public void setScriptResult_NotEqual(String scriptResult, ConditionOptionCall<BoolQueryBuilder> opLambda) {
+        setScriptResult_NotTerm(scriptResult, opLambda);
+    }
+
+    public void setScriptResult_NotTerm(String scriptResult, ConditionOptionCall<BoolQueryBuilder> opLambda) {
+        not(not -> not.setScriptResult_Term(scriptResult), opLambda);
     }
 
     public void setScriptResult_Terms(Collection<String> scriptResultList) {
@@ -1017,19 +985,16 @@ public abstract class BsJobLogCQ extends EsAbstractConditionQuery {
         setScriptType_NotTerm(scriptType, null);
     }
 
-    public void setScriptType_NotEqual(String scriptType, ConditionOptionCall<NotQueryBuilder> opLambda) {
-        setScriptType_NotTerm(scriptType, opLambda);
-    }
-
     public void setScriptType_NotTerm(String scriptType) {
         setScriptType_NotTerm(scriptType, null);
     }
 
-    public void setScriptType_NotTerm(String scriptType, ConditionOptionCall<NotQueryBuilder> opLambda) {
-        NotQueryBuilder builder = QueryBuilders.notQuery(regTermQ("scriptType", scriptType));
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
+    public void setScriptType_NotEqual(String scriptType, ConditionOptionCall<BoolQueryBuilder> opLambda) {
+        setScriptType_NotTerm(scriptType, opLambda);
+    }
+
+    public void setScriptType_NotTerm(String scriptType, ConditionOptionCall<BoolQueryBuilder> opLambda) {
+        not(not -> not.setScriptType_Term(scriptType), opLambda);
     }
 
     public void setScriptType_Terms(Collection<String> scriptTypeList) {
@@ -1183,19 +1148,16 @@ public abstract class BsJobLogCQ extends EsAbstractConditionQuery {
         setStartTime_NotTerm(startTime, null);
     }
 
-    public void setStartTime_NotEqual(Long startTime, ConditionOptionCall<NotQueryBuilder> opLambda) {
-        setStartTime_NotTerm(startTime, opLambda);
-    }
-
     public void setStartTime_NotTerm(Long startTime) {
         setStartTime_NotTerm(startTime, null);
     }
 
-    public void setStartTime_NotTerm(Long startTime, ConditionOptionCall<NotQueryBuilder> opLambda) {
-        NotQueryBuilder builder = QueryBuilders.notQuery(regTermQ("startTime", startTime));
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
+    public void setStartTime_NotEqual(Long startTime, ConditionOptionCall<BoolQueryBuilder> opLambda) {
+        setStartTime_NotTerm(startTime, opLambda);
+    }
+
+    public void setStartTime_NotTerm(Long startTime, ConditionOptionCall<BoolQueryBuilder> opLambda) {
+        not(not -> not.setStartTime_Term(startTime), opLambda);
     }
 
     public void setStartTime_Terms(Collection<Long> startTimeList) {
@@ -1338,19 +1300,16 @@ public abstract class BsJobLogCQ extends EsAbstractConditionQuery {
         setTarget_NotTerm(target, null);
     }
 
-    public void setTarget_NotEqual(String target, ConditionOptionCall<NotQueryBuilder> opLambda) {
-        setTarget_NotTerm(target, opLambda);
-    }
-
     public void setTarget_NotTerm(String target) {
         setTarget_NotTerm(target, null);
     }
 
-    public void setTarget_NotTerm(String target, ConditionOptionCall<NotQueryBuilder> opLambda) {
-        NotQueryBuilder builder = QueryBuilders.notQuery(regTermQ("target", target));
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
+    public void setTarget_NotEqual(String target, ConditionOptionCall<BoolQueryBuilder> opLambda) {
+        setTarget_NotTerm(target, opLambda);
+    }
+
+    public void setTarget_NotTerm(String target, ConditionOptionCall<BoolQueryBuilder> opLambda) {
+        not(not -> not.setTarget_Term(target), opLambda);
     }
 
     public void setTarget_Terms(Collection<String> targetList) {

src/main/java/org/codelibs/fess/es/config/cbean/cq/bs/BsKeyMatchCQ.java

@@ -21,14 +21,11 @@ import java.util.Collection;
 import org.codelibs.fess.es.config.allcommon.EsAbstractConditionQuery;
 import org.codelibs.fess.es.config.cbean.cq.KeyMatchCQ;
 import org.dbflute.cbean.ckey.ConditionKey;
-import org.dbflute.exception.IllegalConditionBeanOperationException;
 import org.elasticsearch.index.query.BoolQueryBuilder;
 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;
@@ -70,19 +67,8 @@ public abstract class BsKeyMatchCQ extends EsAbstractConditionQuery {
         not(notLambda, null);
     }
 
-    public void not(OperatorCall<KeyMatchCQ> notLambda, ConditionOptionCall<NotQueryBuilder> opLambda) {
-        KeyMatchCQ notQuery = new KeyMatchCQ();
-        notLambda.callback(notQuery);
-        if (notQuery.hasQueries()) {
-            if (notQuery.getQueryBuilderList().size() > 1) {
-                final String msg = "not query must be one query.";
-                throw new IllegalConditionBeanOperationException(msg);
-            }
-            NotQueryBuilder builder = QueryBuilders.notQuery(notQuery.getQueryBuilderList().get(0));
-            if (opLambda != null) {
-                opLambda.callback(builder);
-            }
-        }
+    public void not(final OperatorCall<KeyMatchCQ> notLambda, final ConditionOptionCall<BoolQueryBuilder> opLambda) {
+        bool((must, should, mustNot, filter) -> notLambda.callback(mustNot), opLambda);
     }
 
     public void bool(BoolCall<KeyMatchCQ> boolLambda) {
@@ -131,19 +117,16 @@ public abstract class BsKeyMatchCQ extends EsAbstractConditionQuery {
         setId_NotTerm(id, null);
     }
 
-    public void setId_NotEqual(String id, ConditionOptionCall<NotQueryBuilder> opLambda) {
-        setId_NotTerm(id, opLambda);
-    }
-
     public void setId_NotTerm(String id) {
         setId_NotTerm(id, null);
     }
 
-    public void setId_NotTerm(String id, ConditionOptionCall<NotQueryBuilder> opLambda) {
-        NotQueryBuilder builder = QueryBuilders.notQuery(regTermQ("_id", id));
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
+    public void setId_NotEqual(String id, ConditionOptionCall<BoolQueryBuilder> opLambda) {
+        setId_NotTerm(id, opLambda);
+    }
+
+    public void setId_NotTerm(String id, ConditionOptionCall<BoolQueryBuilder> opLambda) {
+        not(not -> not.setId_Term(id), opLambda);
     }
 
     public void setId_Terms(Collection<String> idList) {
@@ -198,19 +181,16 @@ public abstract class BsKeyMatchCQ extends EsAbstractConditionQuery {
         setBoost_NotTerm(boost, null);
     }
 
-    public void setBoost_NotEqual(Float boost, ConditionOptionCall<NotQueryBuilder> opLambda) {
-        setBoost_NotTerm(boost, opLambda);
-    }
-
     public void setBoost_NotTerm(Float boost) {
         setBoost_NotTerm(boost, null);
     }
 
-    public void setBoost_NotTerm(Float boost, ConditionOptionCall<NotQueryBuilder> opLambda) {
-        NotQueryBuilder builder = QueryBuilders.notQuery(regTermQ("boost", boost));
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
+    public void setBoost_NotEqual(Float boost, ConditionOptionCall<BoolQueryBuilder> opLambda) {
+        setBoost_NotTerm(boost, opLambda);
+    }
+
+    public void setBoost_NotTerm(Float boost, ConditionOptionCall<BoolQueryBuilder> opLambda) {
+        not(not -> not.setBoost_Term(boost), opLambda);
     }
 
     public void setBoost_Terms(Collection<Float> boostList) {
@@ -353,19 +333,16 @@ public abstract class BsKeyMatchCQ extends EsAbstractConditionQuery {
         setCreatedBy_NotTerm(createdBy, null);
     }
 
-    public void setCreatedBy_NotEqual(String createdBy, ConditionOptionCall<NotQueryBuilder> opLambda) {
-        setCreatedBy_NotTerm(createdBy, opLambda);
-    }
-
     public void setCreatedBy_NotTerm(String createdBy) {
         setCreatedBy_NotTerm(createdBy, null);
     }
 
-    public void setCreatedBy_NotTerm(String createdBy, ConditionOptionCall<NotQueryBuilder> opLambda) {
-        NotQueryBuilder builder = QueryBuilders.notQuery(regTermQ("createdBy", createdBy));
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
+    public void setCreatedBy_NotEqual(String createdBy, ConditionOptionCall<BoolQueryBuilder> opLambda) {
+        setCreatedBy_NotTerm(createdBy, opLambda);
+    }
+
+    public void setCreatedBy_NotTerm(String createdBy, ConditionOptionCall<BoolQueryBuilder> opLambda) {
+        not(not -> not.setCreatedBy_Term(createdBy), opLambda);
     }
 
     public void setCreatedBy_Terms(Collection<String> createdByList) {
@@ -519,19 +496,16 @@ public abstract class BsKeyMatchCQ extends EsAbstractConditionQuery {
         setCreatedTime_NotTerm(createdTime, null);
     }
 
-    public void setCreatedTime_NotEqual(Long createdTime, ConditionOptionCall<NotQueryBuilder> opLambda) {
-        setCreatedTime_NotTerm(createdTime, opLambda);
-    }
-
     public void setCreatedTime_NotTerm(Long createdTime) {
         setCreatedTime_NotTerm(createdTime, null);
     }
 
-    public void setCreatedTime_NotTerm(Long createdTime, ConditionOptionCall<NotQueryBuilder> opLambda) {
-        NotQueryBuilder builder = QueryBuilders.notQuery(regTermQ("createdTime", createdTime));
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
+    public void setCreatedTime_NotEqual(Long createdTime, ConditionOptionCall<BoolQueryBuilder> opLambda) {
+        setCreatedTime_NotTerm(createdTime, opLambda);
+    }
+
+    public void setCreatedTime_NotTerm(Long createdTime, ConditionOptionCall<BoolQueryBuilder> opLambda) {
+        not(not -> not.setCreatedTime_Term(createdTime), opLambda);
     }
 
     public void setCreatedTime_Terms(Collection<Long> createdTimeList) {
@@ -674,19 +648,16 @@ public abstract class BsKeyMatchCQ extends EsAbstractConditionQuery {
         setMaxSize_NotTerm(maxSize, null);
     }
 
-    public void setMaxSize_NotEqual(Integer maxSize, ConditionOptionCall<NotQueryBuilder> opLambda) {
-        setMaxSize_NotTerm(maxSize, opLambda);
-    }
-
     public void setMaxSize_NotTerm(Integer maxSize) {
         setMaxSize_NotTerm(maxSize, null);
     }
 
-    public void setMaxSize_NotTerm(Integer maxSize, ConditionOptionCall<NotQueryBuilder> opLambda) {
-        NotQueryBuilder builder = QueryBuilders.notQuery(regTermQ("maxSize", maxSize));
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
+    public void setMaxSize_NotEqual(Integer maxSize, ConditionOptionCall<BoolQueryBuilder> opLambda) {
+        setMaxSize_NotTerm(maxSize, opLambda);
+    }
+
+    public void setMaxSize_NotTerm(Integer maxSize, ConditionOptionCall<BoolQueryBuilder> opLambda) {
+        not(not -> not.setMaxSize_Term(maxSize), opLambda);
     }
 
     public void setMaxSize_Terms(Collection<Integer> maxSizeList) {
@@ -829,19 +800,16 @@ public abstract class BsKeyMatchCQ extends EsAbstractConditionQuery {
         setQuery_NotTerm(query, null);
     }
 
-    public void setQuery_NotEqual(String query, ConditionOptionCall<NotQueryBuilder> opLambda) {
-        setQuery_NotTerm(query, opLambda);
-    }
-
     public void setQuery_NotTerm(String query) {
         setQuery_NotTerm(query, null);
     }
 
-    public void setQuery_NotTerm(String query, ConditionOptionCall<NotQueryBuilder> opLambda) {
-        NotQueryBuilder builder = QueryBuilders.notQuery(regTermQ("query", query));
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
+    public void setQuery_NotEqual(String query, ConditionOptionCall<BoolQueryBuilder> opLambda) {
+        setQuery_NotTerm(query, opLambda);
+    }
+
+    public void setQuery_NotTerm(String query, ConditionOptionCall<BoolQueryBuilder> opLambda) {
+        not(not -> not.setQuery_Term(query), opLambda);
     }
 
     public void setQuery_Terms(Collection<String> queryList) {
@@ -995,19 +963,16 @@ public abstract class BsKeyMatchCQ extends EsAbstractConditionQuery {
         setTerm_NotTerm(term, null);
     }
 
-    public void setTerm_NotEqual(String term, ConditionOptionCall<NotQueryBuilder> opLambda) {
-        setTerm_NotTerm(term, opLambda);
-    }
-
     public void setTerm_NotTerm(String term) {
         setTerm_NotTerm(term, null);
     }
 
-    public void setTerm_NotTerm(String term, ConditionOptionCall<NotQueryBuilder> opLambda) {
-        NotQueryBuilder builder = QueryBuilders.notQuery(regTermQ("term", term));
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
+    public void setTerm_NotEqual(String term, ConditionOptionCall<BoolQueryBuilder> opLambda) {
+        setTerm_NotTerm(term, opLambda);
+    }
+
+    public void setTerm_NotTerm(String term, ConditionOptionCall<BoolQueryBuilder> opLambda) {
+        not(not -> not.setTerm_Term(term), opLambda);
     }
 
     public void setTerm_Terms(Collection<String> termList) {
@@ -1161,19 +1126,16 @@ public abstract class BsKeyMatchCQ extends EsAbstractConditionQuery {
         setUpdatedBy_NotTerm(updatedBy, null);
     }
 
-    public void setUpdatedBy_NotEqual(String updatedBy, ConditionOptionCall<NotQueryBuilder> opLambda) {
-        setUpdatedBy_NotTerm(updatedBy, opLambda);
-    }
-
     public void setUpdatedBy_NotTerm(String updatedBy) {
         setUpdatedBy_NotTerm(updatedBy, null);
     }
 
-    public void setUpdatedBy_NotTerm(String updatedBy, ConditionOptionCall<NotQueryBuilder> opLambda) {
-        NotQueryBuilder builder = QueryBuilders.notQuery(regTermQ("updatedBy", updatedBy));
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
+    public void setUpdatedBy_NotEqual(String updatedBy, ConditionOptionCall<BoolQueryBuilder> opLambda) {
+        setUpdatedBy_NotTerm(updatedBy, opLambda);
+    }
+
+    public void setUpdatedBy_NotTerm(String updatedBy, ConditionOptionCall<BoolQueryBuilder> opLambda) {
+        not(not -> not.setUpdatedBy_Term(updatedBy), opLambda);
     }
 
     public void setUpdatedBy_Terms(Collection<String> updatedByList) {
@@ -1327,19 +1289,16 @@ public abstract class BsKeyMatchCQ extends EsAbstractConditionQuery {
         setUpdatedTime_NotTerm(updatedTime, null);
     }
 
-    public void setUpdatedTime_NotEqual(Long updatedTime, ConditionOptionCall<NotQueryBuilder> opLambda) {
-        setUpdatedTime_NotTerm(updatedTime, opLambda);
-    }
-
     public void setUpdatedTime_NotTerm(Long updatedTime) {
         setUpdatedTime_NotTerm(updatedTime, null);
     }
 
-    public void setUpdatedTime_NotTerm(Long updatedTime, ConditionOptionCall<NotQueryBuilder> opLambda) {
-        NotQueryBuilder builder = QueryBuilders.notQuery(regTermQ("updatedTime", updatedTime));
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
+    public void setUpdatedTime_NotEqual(Long updatedTime, ConditionOptionCall<BoolQueryBuilder> opLambda) {
+        setUpdatedTime_NotTerm(updatedTime, opLambda);
+    }
+
+    public void setUpdatedTime_NotTerm(Long updatedTime, ConditionOptionCall<BoolQueryBuilder> opLambda) {
+        not(not -> not.setUpdatedTime_Term(updatedTime), opLambda);
     }
 
     public void setUpdatedTime_Terms(Collection<Long> updatedTimeList) {

src/main/java/org/codelibs/fess/es/config/cbean/cq/bs/BsLabelToRoleCQ.java

@@ -21,14 +21,11 @@ import java.util.Collection;
 import org.codelibs.fess.es.config.allcommon.EsAbstractConditionQuery;
 import org.codelibs.fess.es.config.cbean.cq.LabelToRoleCQ;
 import org.dbflute.cbean.ckey.ConditionKey;
-import org.dbflute.exception.IllegalConditionBeanOperationException;
 import org.elasticsearch.index.query.BoolQueryBuilder;
 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;
@@ -70,19 +67,8 @@ public abstract class BsLabelToRoleCQ extends EsAbstractConditionQuery {
         not(notLambda, null);
     }
 
-    public void not(OperatorCall<LabelToRoleCQ> notLambda, ConditionOptionCall<NotQueryBuilder> opLambda) {
-        LabelToRoleCQ notQuery = new LabelToRoleCQ();
-        notLambda.callback(notQuery);
-        if (notQuery.hasQueries()) {
-            if (notQuery.getQueryBuilderList().size() > 1) {
-                final String msg = "not query must be one query.";
-                throw new IllegalConditionBeanOperationException(msg);
-            }
-            NotQueryBuilder builder = QueryBuilders.notQuery(notQuery.getQueryBuilderList().get(0));
-            if (opLambda != null) {
-                opLambda.callback(builder);
-            }
-        }
+    public void not(final OperatorCall<LabelToRoleCQ> notLambda, final ConditionOptionCall<BoolQueryBuilder> opLambda) {
+        bool((must, should, mustNot, filter) -> notLambda.callback(mustNot), opLambda);
     }
 
     public void bool(BoolCall<LabelToRoleCQ> boolLambda) {
@@ -131,19 +117,16 @@ public abstract class BsLabelToRoleCQ extends EsAbstractConditionQuery {
         setId_NotTerm(id, null);
     }
 
-    public void setId_NotEqual(String id, ConditionOptionCall<NotQueryBuilder> opLambda) {
-        setId_NotTerm(id, opLambda);
-    }
-
     public void setId_NotTerm(String id) {
         setId_NotTerm(id, null);
     }
 
-    public void setId_NotTerm(String id, ConditionOptionCall<NotQueryBuilder> opLambda) {
-        NotQueryBuilder builder = QueryBuilders.notQuery(regTermQ("_id", id));
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
+    public void setId_NotEqual(String id, ConditionOptionCall<BoolQueryBuilder> opLambda) {
+        setId_NotTerm(id, opLambda);
+    }
+
+    public void setId_NotTerm(String id, ConditionOptionCall<BoolQueryBuilder> opLambda) {
+        not(not -> not.setId_Term(id), opLambda);
     }
 
     public void setId_Terms(Collection<String> idList) {
@@ -198,19 +181,16 @@ public abstract class BsLabelToRoleCQ extends EsAbstractConditionQuery {
         setLabelTypeId_NotTerm(labelTypeId, null);
     }
 
-    public void setLabelTypeId_NotEqual(String labelTypeId, ConditionOptionCall<NotQueryBuilder> opLambda) {
-        setLabelTypeId_NotTerm(labelTypeId, opLambda);
-    }
-
     public void setLabelTypeId_NotTerm(String labelTypeId) {
         setLabelTypeId_NotTerm(labelTypeId, null);
     }
 
-    public void setLabelTypeId_NotTerm(String labelTypeId, ConditionOptionCall<NotQueryBuilder> opLambda) {
-        NotQueryBuilder builder = QueryBuilders.notQuery(regTermQ("labelTypeId", labelTypeId));
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
+    public void setLabelTypeId_NotEqual(String labelTypeId, ConditionOptionCall<BoolQueryBuilder> opLambda) {
+        setLabelTypeId_NotTerm(labelTypeId, opLambda);
+    }
+
+    public void setLabelTypeId_NotTerm(String labelTypeId, ConditionOptionCall<BoolQueryBuilder> opLambda) {
+        not(not -> not.setLabelTypeId_Term(labelTypeId), opLambda);
     }
 
     public void setLabelTypeId_Terms(Collection<String> labelTypeIdList) {
@@ -364,19 +344,16 @@ public abstract class BsLabelToRoleCQ extends EsAbstractConditionQuery {
         setRoleTypeId_NotTerm(roleTypeId, null);
     }
 
-    public void setRoleTypeId_NotEqual(String roleTypeId, ConditionOptionCall<NotQueryBuilder> opLambda) {
-        setRoleTypeId_NotTerm(roleTypeId, opLambda);
-    }
-
     public void setRoleTypeId_NotTerm(String roleTypeId) {
         setRoleTypeId_NotTerm(roleTypeId, null);
     }
 
-    public void setRoleTypeId_NotTerm(String roleTypeId, ConditionOptionCall<NotQueryBuilder> opLambda) {
-        NotQueryBuilder builder = QueryBuilders.notQuery(regTermQ("roleTypeId", roleTypeId));
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
+    public void setRoleTypeId_NotEqual(String roleTypeId, ConditionOptionCall<BoolQueryBuilder> opLambda) {
+        setRoleTypeId_NotTerm(roleTypeId, opLambda);
+    }
+
+    public void setRoleTypeId_NotTerm(String roleTypeId, ConditionOptionCall<BoolQueryBuilder> opLambda) {
+        not(not -> not.setRoleTypeId_Term(roleTypeId), opLambda);
     }
 
     public void setRoleTypeId_Terms(Collection<String> roleTypeIdList) {

src/main/java/org/codelibs/fess/es/config/cbean/cq/bs/BsLabelTypeCQ.java

@@ -21,14 +21,11 @@ import java.util.Collection;
 import org.codelibs.fess.es.config.allcommon.EsAbstractConditionQuery;
 import org.codelibs.fess.es.config.cbean.cq.LabelTypeCQ;
 import org.dbflute.cbean.ckey.ConditionKey;
-import org.dbflute.exception.IllegalConditionBeanOperationException;
 import org.elasticsearch.index.query.BoolQueryBuilder;
 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;
@@ -70,19 +67,8 @@ public abstract class BsLabelTypeCQ extends EsAbstractConditionQuery {
         not(notLambda, null);
     }
 
-    public void not(OperatorCall<LabelTypeCQ> notLambda, ConditionOptionCall<NotQueryBuilder> opLambda) {
-        LabelTypeCQ notQuery = new LabelTypeCQ();
-        notLambda.callback(notQuery);
-        if (notQuery.hasQueries()) {
-            if (notQuery.getQueryBuilderList().size() > 1) {
-                final String msg = "not query must be one query.";
-                throw new IllegalConditionBeanOperationException(msg);
-            }
-            NotQueryBuilder builder = QueryBuilders.notQuery(notQuery.getQueryBuilderList().get(0));
-            if (opLambda != null) {
-                opLambda.callback(builder);
-            }
-        }
+    public void not(final OperatorCall<LabelTypeCQ> notLambda, final ConditionOptionCall<BoolQueryBuilder> opLambda) {
+        bool((must, should, mustNot, filter) -> notLambda.callback(mustNot), opLambda);
     }
 
     public void bool(BoolCall<LabelTypeCQ> boolLambda) {
@@ -131,19 +117,16 @@ public abstract class BsLabelTypeCQ extends EsAbstractConditionQuery {
         setId_NotTerm(id, null);
     }
 
-    public void setId_NotEqual(String id, ConditionOptionCall<NotQueryBuilder> opLambda) {
-        setId_NotTerm(id, opLambda);
-    }
-
     public void setId_NotTerm(String id) {
         setId_NotTerm(id, null);
     }
 
-    public void setId_NotTerm(String id, ConditionOptionCall<NotQueryBuilder> opLambda) {
-        NotQueryBuilder builder = QueryBuilders.notQuery(regTermQ("_id", id));
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
+    public void setId_NotEqual(String id, ConditionOptionCall<BoolQueryBuilder> opLambda) {
+        setId_NotTerm(id, opLambda);
+    }
+
+    public void setId_NotTerm(String id, ConditionOptionCall<BoolQueryBuilder> opLambda) {
+        not(not -> not.setId_Term(id), opLambda);
     }
 
     public void setId_Terms(Collection<String> idList) {
@@ -198,19 +181,16 @@ public abstract class BsLabelTypeCQ extends EsAbstractConditionQuery {
         setCreatedBy_NotTerm(createdBy, null);
     }
 
-    public void setCreatedBy_NotEqual(String createdBy, ConditionOptionCall<NotQueryBuilder> opLambda) {
-        setCreatedBy_NotTerm(createdBy, opLambda);
-    }
-
     public void setCreatedBy_NotTerm(String createdBy) {
         setCreatedBy_NotTerm(createdBy, null);
     }
 
-    public void setCreatedBy_NotTerm(String createdBy, ConditionOptionCall<NotQueryBuilder> opLambda) {
-        NotQueryBuilder builder = QueryBuilders.notQuery(regTermQ("createdBy", createdBy));
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
+    public void setCreatedBy_NotEqual(String createdBy, ConditionOptionCall<BoolQueryBuilder> opLambda) {
+        setCreatedBy_NotTerm(createdBy, opLambda);
+    }
+
+    public void setCreatedBy_NotTerm(String createdBy, ConditionOptionCall<BoolQueryBuilder> opLambda) {
+        not(not -> not.setCreatedBy_Term(createdBy), opLambda);
     }
 
     public void setCreatedBy_Terms(Collection<String> createdByList) {
@@ -364,19 +344,16 @@ public abstract class BsLabelTypeCQ extends EsAbstractConditionQuery {
         setCreatedTime_NotTerm(createdTime, null);
     }
 
-    public void setCreatedTime_NotEqual(Long createdTime, ConditionOptionCall<NotQueryBuilder> opLambda) {
-        setCreatedTime_NotTerm(createdTime, opLambda);
-    }
-
     public void setCreatedTime_NotTerm(Long createdTime) {
         setCreatedTime_NotTerm(createdTime, null);
     }
 
-    public void setCreatedTime_NotTerm(Long createdTime, ConditionOptionCall<NotQueryBuilder> opLambda) {
-        NotQueryBuilder builder = QueryBuilders.notQuery(regTermQ("createdTime", createdTime));
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
+    public void setCreatedTime_NotEqual(Long createdTime, ConditionOptionCall<BoolQueryBuilder> opLambda) {
+        setCreatedTime_NotTerm(createdTime, opLambda);
+    }
+
+    public void setCreatedTime_NotTerm(Long createdTime, ConditionOptionCall<BoolQueryBuilder> opLambda) {
+        not(not -> not.setCreatedTime_Term(createdTime), opLambda);
     }
 
     public void setCreatedTime_Terms(Collection<Long> createdTimeList) {
@@ -519,19 +496,16 @@ public abstract class BsLabelTypeCQ extends EsAbstractConditionQuery {
         setExcludedPaths_NotTerm(excludedPaths, null);
     }
 
-    public void setExcludedPaths_NotEqual(String excludedPaths, ConditionOptionCall<NotQueryBuilder> opLambda) {
-        setExcludedPaths_NotTerm(excludedPaths, opLambda);
-    }
-
     public void setExcludedPaths_NotTerm(String excludedPaths) {
         setExcludedPaths_NotTerm(excludedPaths, null);
     }
 
-    public void setExcludedPaths_NotTerm(String excludedPaths, ConditionOptionCall<NotQueryBuilder> opLambda) {
-        NotQueryBuilder builder = QueryBuilders.notQuery(regTermQ("excludedPaths", excludedPaths));
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
+    public void setExcludedPaths_NotEqual(String excludedPaths, ConditionOptionCall<BoolQueryBuilder> opLambda) {
+        setExcludedPaths_NotTerm(excludedPaths, opLambda);
+    }
+
+    public void setExcludedPaths_NotTerm(String excludedPaths, ConditionOptionCall<BoolQueryBuilder> opLambda) {
+        not(not -> not.setExcludedPaths_Term(excludedPaths), opLambda);
     }
 
     public void setExcludedPaths_Terms(Collection<String> excludedPathsList) {
@@ -685,19 +659,16 @@ public abstract class BsLabelTypeCQ extends EsAbstractConditionQuery {
         setIncludedPaths_NotTerm(includedPaths, null);
     }
 
-    public void setIncludedPaths_NotEqual(String includedPaths, ConditionOptionCall<NotQueryBuilder> opLambda) {
-        setIncludedPaths_NotTerm(includedPaths, opLambda);
-    }
-
     public void setIncludedPaths_NotTerm(String includedPaths) {
         setIncludedPaths_NotTerm(includedPaths, null);
     }
 
-    public void setIncludedPaths_NotTerm(String includedPaths, ConditionOptionCall<NotQueryBuilder> opLambda) {
-        NotQueryBuilder builder = QueryBuilders.notQuery(regTermQ("includedPaths", includedPaths));
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
+    public void setIncludedPaths_NotEqual(String includedPaths, ConditionOptionCall<BoolQueryBuilder> opLambda) {
+        setIncludedPaths_NotTerm(includedPaths, opLambda);
+    }
+
+    public void setIncludedPaths_NotTerm(String includedPaths, ConditionOptionCall<BoolQueryBuilder> opLambda) {
+        not(not -> not.setIncludedPaths_Term(includedPaths), opLambda);
     }
 
     public void setIncludedPaths_Terms(Collection<String> includedPathsList) {
@@ -851,19 +822,16 @@ public abstract class BsLabelTypeCQ extends EsAbstractConditionQuery {
         setName_NotTerm(name, null);
     }
 
-    public void setName_NotEqual(String name, ConditionOptionCall<NotQueryBuilder> opLambda) {
-        setName_NotTerm(name, opLambda);
-    }
-
     public void setName_NotTerm(String name) {
         setName_NotTerm(name, null);
     }
 
-    public void setName_NotTerm(String name, ConditionOptionCall<NotQueryBuilder> opLambda) {
-        NotQueryBuilder builder = QueryBuilders.notQuery(regTermQ("name", name));
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
+    public void setName_NotEqual(String name, ConditionOptionCall<BoolQueryBuilder> opLambda) {
+        setName_NotTerm(name, opLambda);
+    }
+
+    public void setName_NotTerm(String name, ConditionOptionCall<BoolQueryBuilder> opLambda) {
+        not(not -> not.setName_Term(name), opLambda);
     }
 
     public void setName_Terms(Collection<String> nameList) {
@@ -1017,19 +985,16 @@ public abstract class BsLabelTypeCQ extends EsAbstractConditionQuery {
         setPermissions_NotTerm(permissions, null);
     }
 
-    public void setPermissions_NotEqual(String permissions, ConditionOptionCall<NotQueryBuilder> opLambda) {
-        setPermissions_NotTerm(permissions, opLambda);
-    }
-
     public void setPermissions_NotTerm(String permissions) {
         setPermissions_NotTerm(permissions, null);
     }
 
-    public void setPermissions_NotTerm(String permissions, ConditionOptionCall<NotQueryBuilder> opLambda) {
-        NotQueryBuilder builder = QueryBuilders.notQuery(regTermQ("permissions", permissions));
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
+    public void setPermissions_NotEqual(String permissions, ConditionOptionCall<BoolQueryBuilder> opLambda) {
+        setPermissions_NotTerm(permissions, opLambda);
+    }
+
+    public void setPermissions_NotTerm(String permissions, ConditionOptionCall<BoolQueryBuilder> opLambda) {
+        not(not -> not.setPermissions_Term(permissions), opLambda);
     }
 
     public void setPermissions_Terms(Collection<String> permissionsList) {
@@ -1183,19 +1148,16 @@ public abstract class BsLabelTypeCQ extends EsAbstractConditionQuery {
         setSortOrder_NotTerm(sortOrder, null);
     }
 
-    public void setSortOrder_NotEqual(Integer sortOrder, ConditionOptionCall<NotQueryBuilder> opLambda) {
-        setSortOrder_NotTerm(sortOrder, opLambda);
-    }
-
     public void setSortOrder_NotTerm(Integer sortOrder) {
         setSortOrder_NotTerm(sortOrder, null);
     }
 
-    public void setSortOrder_NotTerm(Integer sortOrder, ConditionOptionCall<NotQueryBuilder> opLambda) {
-        NotQueryBuilder builder = QueryBuilders.notQuery(regTermQ("sortOrder", sortOrder));
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
+    public void setSortOrder_NotEqual(Integer sortOrder, ConditionOptionCall<BoolQueryBuilder> opLambda) {
+        setSortOrder_NotTerm(sortOrder, opLambda);
+    }
+
+    public void setSortOrder_NotTerm(Integer sortOrder, ConditionOptionCall<BoolQueryBuilder> opLambda) {
+        not(not -> not.setSortOrder_Term(sortOrder), opLambda);
     }
 
     public void setSortOrder_Terms(Collection<Integer> sortOrderList) {
@@ -1338,19 +1300,16 @@ public abstract class BsLabelTypeCQ extends EsAbstractConditionQuery {
         setUpdatedBy_NotTerm(updatedBy, null);
     }
 
-    public void setUpdatedBy_NotEqual(String updatedBy, ConditionOptionCall<NotQueryBuilder> opLambda) {
-        setUpdatedBy_NotTerm(updatedBy, opLambda);
-    }
-
     public void setUpdatedBy_NotTerm(String updatedBy) {
         setUpdatedBy_NotTerm(updatedBy, null);
     }
 
-    public void setUpdatedBy_NotTerm(String updatedBy, ConditionOptionCall<NotQueryBuilder> opLambda) {
-        NotQueryBuilder builder = QueryBuilders.notQuery(regTermQ("updatedBy", updatedBy));
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
+    public void setUpdatedBy_NotEqual(String updatedBy, ConditionOptionCall<BoolQueryBuilder> opLambda) {
+        setUpdatedBy_NotTerm(updatedBy, opLambda);
+    }
+
+    public void setUpdatedBy_NotTerm(String updatedBy, ConditionOptionCall<BoolQueryBuilder> opLambda) {
+        not(not -> not.setUpdatedBy_Term(updatedBy), opLambda);
     }
 
     public void setUpdatedBy_Terms(Collection<String> updatedByList) {
@@ -1504,19 +1463,16 @@ public abstract class BsLabelTypeCQ extends EsAbstractConditionQuery {
         setUpdatedTime_NotTerm(updatedTime, null);
     }
 
-    public void setUpdatedTime_NotEqual(Long updatedTime, ConditionOptionCall<NotQueryBuilder> opLambda) {
-        setUpdatedTime_NotTerm(updatedTime, opLambda);
-    }
-
     public void setUpdatedTime_NotTerm(Long updatedTime) {
         setUpdatedTime_NotTerm(updatedTime, null);
     }
 
-    public void setUpdatedTime_NotTerm(Long updatedTime, ConditionOptionCall<NotQueryBuilder> opLambda) {
-        NotQueryBuilder builder = QueryBuilders.notQuery(regTermQ("updatedTime", updatedTime));
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
+    public void setUpdatedTime_NotEqual(Long updatedTime, ConditionOptionCall<BoolQueryBuilder> opLambda) {
+        setUpdatedTime_NotTerm(updatedTime, opLambda);
+    }
+
+    public void setUpdatedTime_NotTerm(Long updatedTime, ConditionOptionCall<BoolQueryBuilder> opLambda) {
+        not(not -> not.setUpdatedTime_Term(updatedTime), opLambda);
     }
 
     public void setUpdatedTime_Terms(Collection<Long> updatedTimeList) {
@@ -1659,19 +1615,16 @@ public abstract class BsLabelTypeCQ extends EsAbstractConditionQuery {
         setValue_NotTerm(value, null);
     }
 
-    public void setValue_NotEqual(String value, ConditionOptionCall<NotQueryBuilder> opLambda) {
-        setValue_NotTerm(value, opLambda);
-    }
-
     public void setValue_NotTerm(String value) {
         setValue_NotTerm(value, null);
     }
 
-    public void setValue_NotTerm(String value, ConditionOptionCall<NotQueryBuilder> opLambda) {
-        NotQueryBuilder builder = QueryBuilders.notQuery(regTermQ("value", value));
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
+    public void setValue_NotEqual(String value, ConditionOptionCall<BoolQueryBuilder> opLambda) {
+        setValue_NotTerm(value, opLambda);
+    }
+
+    public void setValue_NotTerm(String value, ConditionOptionCall<BoolQueryBuilder> opLambda) {
+        not(not -> not.setValue_Term(value), opLambda);
     }
 
     public void setValue_Terms(Collection<String> valueList) {

src/main/java/org/codelibs/fess/es/config/cbean/cq/bs/BsPathMappingCQ.java

@@ -21,14 +21,11 @@ import java.util.Collection;
 import org.codelibs.fess.es.config.allcommon.EsAbstractConditionQuery;
 import org.codelibs.fess.es.config.cbean.cq.PathMappingCQ;
 import org.dbflute.cbean.ckey.ConditionKey;
-import org.dbflute.exception.IllegalConditionBeanOperationException;
 import org.elasticsearch.index.query.BoolQueryBuilder;
 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;
@@ -70,19 +67,8 @@ public abstract class BsPathMappingCQ extends EsAbstractConditionQuery {
         not(notLambda, null);
     }
 
-    public void not(OperatorCall<PathMappingCQ> notLambda, ConditionOptionCall<NotQueryBuilder> opLambda) {
-        PathMappingCQ notQuery = new PathMappingCQ();
-        notLambda.callback(notQuery);
-        if (notQuery.hasQueries()) {
-            if (notQuery.getQueryBuilderList().size() > 1) {
-                final String msg = "not query must be one query.";
-                throw new IllegalConditionBeanOperationException(msg);
-            }
-            NotQueryBuilder builder = QueryBuilders.notQuery(notQuery.getQueryBuilderList().get(0));
-            if (opLambda != null) {
-                opLambda.callback(builder);
-            }
-        }
+    public void not(final OperatorCall<PathMappingCQ> notLambda, final ConditionOptionCall<BoolQueryBuilder> opLambda) {
+        bool((must, should, mustNot, filter) -> notLambda.callback(mustNot), opLambda);
     }
 
     public void bool(BoolCall<PathMappingCQ> boolLambda) {
@@ -131,19 +117,16 @@ public abstract class BsPathMappingCQ extends EsAbstractConditionQuery {
         setId_NotTerm(id, null);
     }
 
-    public void setId_NotEqual(String id, ConditionOptionCall<NotQueryBuilder> opLambda) {
-        setId_NotTerm(id, opLambda);
-    }
-
     public void setId_NotTerm(String id) {
         setId_NotTerm(id, null);
     }
 
-    public void setId_NotTerm(String id, ConditionOptionCall<NotQueryBuilder> opLambda) {
-        NotQueryBuilder builder = QueryBuilders.notQuery(regTermQ("_id", id));
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
+    public void setId_NotEqual(String id, ConditionOptionCall<BoolQueryBuilder> opLambda) {
+        setId_NotTerm(id, opLambda);
+    }
+
+    public void setId_NotTerm(String id, ConditionOptionCall<BoolQueryBuilder> opLambda) {
+        not(not -> not.setId_Term(id), opLambda);
     }
 
     public void setId_Terms(Collection<String> idList) {
@@ -198,19 +181,16 @@ public abstract class BsPathMappingCQ extends EsAbstractConditionQuery {
         setCreatedBy_NotTerm(createdBy, null);
     }
 
-    public void setCreatedBy_NotEqual(String createdBy, ConditionOptionCall<NotQueryBuilder> opLambda) {
-        setCreatedBy_NotTerm(createdBy, opLambda);
-    }
-
     public void setCreatedBy_NotTerm(String createdBy) {
         setCreatedBy_NotTerm(createdBy, null);
     }
 
-    public void setCreatedBy_NotTerm(String createdBy, ConditionOptionCall<NotQueryBuilder> opLambda) {
-        NotQueryBuilder builder = QueryBuilders.notQuery(regTermQ("createdBy", createdBy));
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
+    public void setCreatedBy_NotEqual(String createdBy, ConditionOptionCall<BoolQueryBuilder> opLambda) {
+        setCreatedBy_NotTerm(createdBy, opLambda);
+    }
+
+    public void setCreatedBy_NotTerm(String createdBy, ConditionOptionCall<BoolQueryBuilder> opLambda) {
+        not(not -> not.setCreatedBy_Term(createdBy), opLambda);
     }
 
     public void setCreatedBy_Terms(Collection<String> createdByList) {
@@ -364,19 +344,16 @@ public abstract class BsPathMappingCQ extends EsAbstractConditionQuery {
         setCreatedTime_NotTerm(createdTime, null);
     }
 
-    public void setCreatedTime_NotEqual(Long createdTime, ConditionOptionCall<NotQueryBuilder> opLambda) {
-        setCreatedTime_NotTerm(createdTime, opLambda);
-    }
-
     public void setCreatedTime_NotTerm(Long createdTime) {
         setCreatedTime_NotTerm(createdTime, null);
     }
 
-    public void setCreatedTime_NotTerm(Long createdTime, ConditionOptionCall<NotQueryBuilder> opLambda) {
-        NotQueryBuilder builder = QueryBuilders.notQuery(regTermQ("createdTime", createdTime));
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
+    public void setCreatedTime_NotEqual(Long createdTime, ConditionOptionCall<BoolQueryBuilder> opLambda) {
+        setCreatedTime_NotTerm(createdTime, opLambda);
+    }
+
+    public void setCreatedTime_NotTerm(Long createdTime, ConditionOptionCall<BoolQueryBuilder> opLambda) {
+        not(not -> not.setCreatedTime_Term(createdTime), opLambda);
     }
 
     public void setCreatedTime_Terms(Collection<Long> createdTimeList) {
@@ -519,19 +496,16 @@ public abstract class BsPathMappingCQ extends EsAbstractConditionQuery {
         setProcessType_NotTerm(processType, null);
     }
 
-    public void setProcessType_NotEqual(String processType, ConditionOptionCall<NotQueryBuilder> opLambda) {
-        setProcessType_NotTerm(processType, opLambda);
-    }
-
     public void setProcessType_NotTerm(String processType) {
         setProcessType_NotTerm(processType, null);
     }
 
-    public void setProcessType_NotTerm(String processType, ConditionOptionCall<NotQueryBuilder> opLambda) {
-        NotQueryBuilder builder = QueryBuilders.notQuery(regTermQ("processType", processType));
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
+    public void setProcessType_NotEqual(String processType, ConditionOptionCall<BoolQueryBuilder> opLambda) {
+        setProcessType_NotTerm(processType, opLambda);
+    }
+
+    public void setProcessType_NotTerm(String processType, ConditionOptionCall<BoolQueryBuilder> opLambda) {
+        not(not -> not.setProcessType_Term(processType), opLambda);
     }
 
     public void setProcessType_Terms(Collection<String> processTypeList) {
@@ -685,19 +659,16 @@ public abstract class BsPathMappingCQ extends EsAbstractConditionQuery {
         setRegex_NotTerm(regex, null);
     }
 
-    public void setRegex_NotEqual(String regex, ConditionOptionCall<NotQueryBuilder> opLambda) {
-        setRegex_NotTerm(regex, opLambda);
-    }
-
     public void setRegex_NotTerm(String regex) {
         setRegex_NotTerm(regex, null);
     }
 
-    public void setRegex_NotTerm(String regex, ConditionOptionCall<NotQueryBuilder> opLambda) {
-        NotQueryBuilder builder = QueryBuilders.notQuery(regTermQ("regex", regex));
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
+    public void setRegex_NotEqual(String regex, ConditionOptionCall<BoolQueryBuilder> opLambda) {
+        setRegex_NotTerm(regex, opLambda);
+    }
+
+    public void setRegex_NotTerm(String regex, ConditionOptionCall<BoolQueryBuilder> opLambda) {
+        not(not -> not.setRegex_Term(regex), opLambda);
     }
 
     public void setRegex_Terms(Collection<String> regexList) {
@@ -851,19 +822,16 @@ public abstract class BsPathMappingCQ extends EsAbstractConditionQuery {
         setReplacement_NotTerm(replacement, null);
     }
 
-    public void setReplacement_NotEqual(String replacement, ConditionOptionCall<NotQueryBuilder> opLambda) {
-        setReplacement_NotTerm(replacement, opLambda);
-    }
-
     public void setReplacement_NotTerm(String replacement) {
         setReplacement_NotTerm(replacement, null);
     }
 
-    public void setReplacement_NotTerm(String replacement, ConditionOptionCall<NotQueryBuilder> opLambda) {
-        NotQueryBuilder builder = QueryBuilders.notQuery(regTermQ("replacement", replacement));
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
+    public void setReplacement_NotEqual(String replacement, ConditionOptionCall<BoolQueryBuilder> opLambda) {
+        setReplacement_NotTerm(replacement, opLambda);
+    }
+
+    public void setReplacement_NotTerm(String replacement, ConditionOptionCall<BoolQueryBuilder> opLambda) {
+        not(not -> not.setReplacement_Term(replacement), opLambda);
     }
 
     public void setReplacement_Terms(Collection<String> replacementList) {
@@ -1017,19 +985,16 @@ public abstract class BsPathMappingCQ extends EsAbstractConditionQuery {
         setSortOrder_NotTerm(sortOrder, null);
     }
 
-    public void setSortOrder_NotEqual(Integer sortOrder, ConditionOptionCall<NotQueryBuilder> opLambda) {
-        setSortOrder_NotTerm(sortOrder, opLambda);
-    }
-
     public void setSortOrder_NotTerm(Integer sortOrder) {
         setSortOrder_NotTerm(sortOrder, null);
     }
 
-    public void setSortOrder_NotTerm(Integer sortOrder, ConditionOptionCall<NotQueryBuilder> opLambda) {
-        NotQueryBuilder builder = QueryBuilders.notQuery(regTermQ("sortOrder", sortOrder));
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
+    public void setSortOrder_NotEqual(Integer sortOrder, ConditionOptionCall<BoolQueryBuilder> opLambda) {
+        setSortOrder_NotTerm(sortOrder, opLambda);
+    }
+
+    public void setSortOrder_NotTerm(Integer sortOrder, ConditionOptionCall<BoolQueryBuilder> opLambda) {
+        not(not -> not.setSortOrder_Term(sortOrder), opLambda);
     }
 
     public void setSortOrder_Terms(Collection<Integer> sortOrderList) {
@@ -1172,19 +1137,16 @@ public abstract class BsPathMappingCQ extends EsAbstractConditionQuery {
         setUpdatedBy_NotTerm(updatedBy, null);
     }
 
-    public void setUpdatedBy_NotEqual(String updatedBy, ConditionOptionCall<NotQueryBuilder> opLambda) {
-        setUpdatedBy_NotTerm(updatedBy, opLambda);
-    }
-
     public void setUpdatedBy_NotTerm(String updatedBy) {
         setUpdatedBy_NotTerm(updatedBy, null);
     }
 
-    public void setUpdatedBy_NotTerm(String updatedBy, ConditionOptionCall<NotQueryBuilder> opLambda) {
-        NotQueryBuilder builder = QueryBuilders.notQuery(regTermQ("updatedBy", updatedBy));
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
+    public void setUpdatedBy_NotEqual(String updatedBy, ConditionOptionCall<BoolQueryBuilder> opLambda) {
+        setUpdatedBy_NotTerm(updatedBy, opLambda);
+    }
+
+    public void setUpdatedBy_NotTerm(String updatedBy, ConditionOptionCall<BoolQueryBuilder> opLambda) {
+        not(not -> not.setUpdatedBy_Term(updatedBy), opLambda);
     }
 
     public void setUpdatedBy_Terms(Collection<String> updatedByList) {
@@ -1338,19 +1300,16 @@ public abstract class BsPathMappingCQ extends EsAbstractConditionQuery {
         setUpdatedTime_NotTerm(updatedTime, null);
     }
 
-    public void setUpdatedTime_NotEqual(Long updatedTime, ConditionOptionCall<NotQueryBuilder> opLambda) {
-        setUpdatedTime_NotTerm(updatedTime, opLambda);
-    }
-
     public void setUpdatedTime_NotTerm(Long updatedTime) {
         setUpdatedTime_NotTerm(updatedTime, null);
     }
 
-    public void setUpdatedTime_NotTerm(Long updatedTime, ConditionOptionCall<NotQueryBuilder> opLambda) {
-        NotQueryBuilder builder = QueryBuilders.notQuery(regTermQ("updatedTime", updatedTime));
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
+    public void setUpdatedTime_NotEqual(Long updatedTime, ConditionOptionCall<BoolQueryBuilder> opLambda) {
+        setUpdatedTime_NotTerm(updatedTime, opLambda);
+    }
+
+    public void setUpdatedTime_NotTerm(Long updatedTime, ConditionOptionCall<BoolQueryBuilder> opLambda) {
+        not(not -> not.setUpdatedTime_Term(updatedTime), opLambda);
     }
 
     public void setUpdatedTime_Terms(Collection<Long> updatedTimeList) {

src/main/java/org/codelibs/fess/es/config/cbean/cq/bs/BsRequestHeaderCQ.java

@@ -21,14 +21,11 @@ import java.util.Collection;
 import org.codelibs.fess.es.config.allcommon.EsAbstractConditionQuery;
 import org.codelibs.fess.es.config.cbean.cq.RequestHeaderCQ;
 import org.dbflute.cbean.ckey.ConditionKey;
-import org.dbflute.exception.IllegalConditionBeanOperationException;
 import org.elasticsearch.index.query.BoolQueryBuilder;
 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;
@@ -70,19 +67,8 @@ public abstract class BsRequestHeaderCQ extends EsAbstractConditionQuery {
         not(notLambda, null);
     }
 
-    public void not(OperatorCall<RequestHeaderCQ> notLambda, ConditionOptionCall<NotQueryBuilder> opLambda) {
-        RequestHeaderCQ notQuery = new RequestHeaderCQ();
-        notLambda.callback(notQuery);
-        if (notQuery.hasQueries()) {
-            if (notQuery.getQueryBuilderList().size() > 1) {
-                final String msg = "not query must be one query.";
-                throw new IllegalConditionBeanOperationException(msg);
-            }
-            NotQueryBuilder builder = QueryBuilders.notQuery(notQuery.getQueryBuilderList().get(0));
-            if (opLambda != null) {
-                opLambda.callback(builder);
-            }
-        }
+    public void not(final OperatorCall<RequestHeaderCQ> notLambda, final ConditionOptionCall<BoolQueryBuilder> opLambda) {
+        bool((must, should, mustNot, filter) -> notLambda.callback(mustNot), opLambda);
     }
 
     public void bool(BoolCall<RequestHeaderCQ> boolLambda) {
@@ -131,19 +117,16 @@ public abstract class BsRequestHeaderCQ extends EsAbstractConditionQuery {
         setId_NotTerm(id, null);
     }
 
-    public void setId_NotEqual(String id, ConditionOptionCall<NotQueryBuilder> opLambda) {
-        setId_NotTerm(id, opLambda);
-    }
-
     public void setId_NotTerm(String id) {
         setId_NotTerm(id, null);
     }
 
-    public void setId_NotTerm(String id, ConditionOptionCall<NotQueryBuilder> opLambda) {
-        NotQueryBuilder builder = QueryBuilders.notQuery(regTermQ("_id", id));
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
+    public void setId_NotEqual(String id, ConditionOptionCall<BoolQueryBuilder> opLambda) {
+        setId_NotTerm(id, opLambda);
+    }
+
+    public void setId_NotTerm(String id, ConditionOptionCall<BoolQueryBuilder> opLambda) {
+        not(not -> not.setId_Term(id), opLambda);
     }
 
     public void setId_Terms(Collection<String> idList) {
@@ -198,19 +181,16 @@ public abstract class BsRequestHeaderCQ extends EsAbstractConditionQuery {
         setCreatedBy_NotTerm(createdBy, null);
     }
 
-    public void setCreatedBy_NotEqual(String createdBy, ConditionOptionCall<NotQueryBuilder> opLambda) {
-        setCreatedBy_NotTerm(createdBy, opLambda);
-    }
-
     public void setCreatedBy_NotTerm(String createdBy) {
         setCreatedBy_NotTerm(createdBy, null);
     }
 
-    public void setCreatedBy_NotTerm(String createdBy, ConditionOptionCall<NotQueryBuilder> opLambda) {
-        NotQueryBuilder builder = QueryBuilders.notQuery(regTermQ("createdBy", createdBy));
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
+    public void setCreatedBy_NotEqual(String createdBy, ConditionOptionCall<BoolQueryBuilder> opLambda) {
+        setCreatedBy_NotTerm(createdBy, opLambda);
+    }
+
+    public void setCreatedBy_NotTerm(String createdBy, ConditionOptionCall<BoolQueryBuilder> opLambda) {
+        not(not -> not.setCreatedBy_Term(createdBy), opLambda);
     }
 
     public void setCreatedBy_Terms(Collection<String> createdByList) {
@@ -364,19 +344,16 @@ public abstract class BsRequestHeaderCQ extends EsAbstractConditionQuery {
         setCreatedTime_NotTerm(createdTime, null);
     }
 
-    public void setCreatedTime_NotEqual(Long createdTime, ConditionOptionCall<NotQueryBuilder> opLambda) {
-        setCreatedTime_NotTerm(createdTime, opLambda);
-    }
-
     public void setCreatedTime_NotTerm(Long createdTime) {
         setCreatedTime_NotTerm(createdTime, null);
     }
 
-    public void setCreatedTime_NotTerm(Long createdTime, ConditionOptionCall<NotQueryBuilder> opLambda) {
-        NotQueryBuilder builder = QueryBuilders.notQuery(regTermQ("createdTime", createdTime));
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
+    public void setCreatedTime_NotEqual(Long createdTime, ConditionOptionCall<BoolQueryBuilder> opLambda) {
+        setCreatedTime_NotTerm(createdTime, opLambda);
+    }
+
+    public void setCreatedTime_NotTerm(Long createdTime, ConditionOptionCall<BoolQueryBuilder> opLambda) {
+        not(not -> not.setCreatedTime_Term(createdTime), opLambda);
     }
 
     public void setCreatedTime_Terms(Collection<Long> createdTimeList) {
@@ -519,19 +496,16 @@ public abstract class BsRequestHeaderCQ extends EsAbstractConditionQuery {
         setName_NotTerm(name, null);
     }
 
-    public void setName_NotEqual(String name, ConditionOptionCall<NotQueryBuilder> opLambda) {
-        setName_NotTerm(name, opLambda);
-    }
-
     public void setName_NotTerm(String name) {
         setName_NotTerm(name, null);
     }
 
-    public void setName_NotTerm(String name, ConditionOptionCall<NotQueryBuilder> opLambda) {
-        NotQueryBuilder builder = QueryBuilders.notQuery(regTermQ("name", name));
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
+    public void setName_NotEqual(String name, ConditionOptionCall<BoolQueryBuilder> opLambda) {
+        setName_NotTerm(name, opLambda);
+    }
+
+    public void setName_NotTerm(String name, ConditionOptionCall<BoolQueryBuilder> opLambda) {
+        not(not -> not.setName_Term(name), opLambda);
     }
 
     public void setName_Terms(Collection<String> nameList) {
@@ -685,19 +659,16 @@ public abstract class BsRequestHeaderCQ extends EsAbstractConditionQuery {
         setUpdatedBy_NotTerm(updatedBy, null);
     }
 
-    public void setUpdatedBy_NotEqual(String updatedBy, ConditionOptionCall<NotQueryBuilder> opLambda) {
-        setUpdatedBy_NotTerm(updatedBy, opLambda);
-    }
-
     public void setUpdatedBy_NotTerm(String updatedBy) {
         setUpdatedBy_NotTerm(updatedBy, null);
     }
 
-    public void setUpdatedBy_NotTerm(String updatedBy, ConditionOptionCall<NotQueryBuilder> opLambda) {
-        NotQueryBuilder builder = QueryBuilders.notQuery(regTermQ("updatedBy", updatedBy));
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
+    public void setUpdatedBy_NotEqual(String updatedBy, ConditionOptionCall<BoolQueryBuilder> opLambda) {
+        setUpdatedBy_NotTerm(updatedBy, opLambda);
+    }
+
+    public void setUpdatedBy_NotTerm(String updatedBy, ConditionOptionCall<BoolQueryBuilder> opLambda) {
+        not(not -> not.setUpdatedBy_Term(updatedBy), opLambda);
     }
 
     public void setUpdatedBy_Terms(Collection<String> updatedByList) {
@@ -851,19 +822,16 @@ public abstract class BsRequestHeaderCQ extends EsAbstractConditionQuery {
         setUpdatedTime_NotTerm(updatedTime, null);
     }
 
-    public void setUpdatedTime_NotEqual(Long updatedTime, ConditionOptionCall<NotQueryBuilder> opLambda) {
-        setUpdatedTime_NotTerm(updatedTime, opLambda);
-    }
-
     public void setUpdatedTime_NotTerm(Long updatedTime) {
         setUpdatedTime_NotTerm(updatedTime, null);
     }
 
-    public void setUpdatedTime_NotTerm(Long updatedTime, ConditionOptionCall<NotQueryBuilder> opLambda) {
-        NotQueryBuilder builder = QueryBuilders.notQuery(regTermQ("updatedTime", updatedTime));
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
+    public void setUpdatedTime_NotEqual(Long updatedTime, ConditionOptionCall<BoolQueryBuilder> opLambda) {
+        setUpdatedTime_NotTerm(updatedTime, opLambda);
+    }
+
+    public void setUpdatedTime_NotTerm(Long updatedTime, ConditionOptionCall<BoolQueryBuilder> opLambda) {
+        not(not -> not.setUpdatedTime_Term(updatedTime), opLambda);
     }
 
     public void setUpdatedTime_Terms(Collection<Long> updatedTimeList) {
@@ -1006,19 +974,16 @@ public abstract class BsRequestHeaderCQ extends EsAbstractConditionQuery {
         setValue_NotTerm(value, null);
     }
 
-    public void setValue_NotEqual(String value, ConditionOptionCall<NotQueryBuilder> opLambda) {
-        setValue_NotTerm(value, opLambda);
-    }
-
     public void setValue_NotTerm(String value) {
         setValue_NotTerm(value, null);
     }
 
-    public void setValue_NotTerm(String value, ConditionOptionCall<NotQueryBuilder> opLambda) {
-        NotQueryBuilder builder = QueryBuilders.notQuery(regTermQ("value", value));
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
+    public void setValue_NotEqual(String value, ConditionOptionCall<BoolQueryBuilder> opLambda) {
+        setValue_NotTerm(value, opLambda);
+    }
+
+    public void setValue_NotTerm(String value, ConditionOptionCall<BoolQueryBuilder> opLambda) {
+        not(not -> not.setValue_Term(value), opLambda);
     }
 
     public void setValue_Terms(Collection<String> valueList) {
@@ -1172,19 +1137,16 @@ public abstract class BsRequestHeaderCQ extends EsAbstractConditionQuery {
         setWebConfigId_NotTerm(webConfigId, null);
     }
 
-    public void setWebConfigId_NotEqual(String webConfigId, ConditionOptionCall<NotQueryBuilder> opLambda) {
-        setWebConfigId_NotTerm(webConfigId, opLambda);
-    }
-
     public void setWebConfigId_NotTerm(String webConfigId) {
         setWebConfigId_NotTerm(webConfigId, null);
     }
 
-    public void setWebConfigId_NotTerm(String webConfigId, ConditionOptionCall<NotQueryBuilder> opLambda) {
-        NotQueryBuilder builder = QueryBuilders.notQuery(regTermQ("webConfigId", webConfigId));
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
+    public void setWebConfigId_NotEqual(String webConfigId, ConditionOptionCall<BoolQueryBuilder> opLambda) {
+        setWebConfigId_NotTerm(webConfigId, opLambda);
+    }
+
+    public void setWebConfigId_NotTerm(String webConfigId, ConditionOptionCall<BoolQueryBuilder> opLambda) {
+        not(not -> not.setWebConfigId_Term(webConfigId), opLambda);
     }
 
     public void setWebConfigId_Terms(Collection<String> webConfigIdList) {

src/main/java/org/codelibs/fess/es/config/cbean/cq/bs/BsRoleTypeCQ.java

@@ -21,14 +21,11 @@ import java.util.Collection;
 import org.codelibs.fess.es.config.allcommon.EsAbstractConditionQuery;
 import org.codelibs.fess.es.config.cbean.cq.RoleTypeCQ;
 import org.dbflute.cbean.ckey.ConditionKey;
-import org.dbflute.exception.IllegalConditionBeanOperationException;
 import org.elasticsearch.index.query.BoolQueryBuilder;
 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;
@@ -70,19 +67,8 @@ public abstract class BsRoleTypeCQ extends EsAbstractConditionQuery {
         not(notLambda, null);
     }
 
-    public void not(OperatorCall<RoleTypeCQ> notLambda, ConditionOptionCall<NotQueryBuilder> opLambda) {
-        RoleTypeCQ notQuery = new RoleTypeCQ();
-        notLambda.callback(notQuery);
-        if (notQuery.hasQueries()) {
-            if (notQuery.getQueryBuilderList().size() > 1) {
-                final String msg = "not query must be one query.";
-                throw new IllegalConditionBeanOperationException(msg);
-            }
-            NotQueryBuilder builder = QueryBuilders.notQuery(notQuery.getQueryBuilderList().get(0));
-            if (opLambda != null) {
-                opLambda.callback(builder);
-            }
-        }
+    public void not(final OperatorCall<RoleTypeCQ> notLambda, final ConditionOptionCall<BoolQueryBuilder> opLambda) {
+        bool((must, should, mustNot, filter) -> notLambda.callback(mustNot), opLambda);
     }
 
     public void bool(BoolCall<RoleTypeCQ> boolLambda) {
@@ -131,19 +117,16 @@ public abstract class BsRoleTypeCQ extends EsAbstractConditionQuery {
         setId_NotTerm(id, null);
     }
 
-    public void setId_NotEqual(String id, ConditionOptionCall<NotQueryBuilder> opLambda) {
-        setId_NotTerm(id, opLambda);
-    }
-
     public void setId_NotTerm(String id) {
         setId_NotTerm(id, null);
     }
 
-    public void setId_NotTerm(String id, ConditionOptionCall<NotQueryBuilder> opLambda) {
-        NotQueryBuilder builder = QueryBuilders.notQuery(regTermQ("_id", id));
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
+    public void setId_NotEqual(String id, ConditionOptionCall<BoolQueryBuilder> opLambda) {
+        setId_NotTerm(id, opLambda);
+    }
+
+    public void setId_NotTerm(String id, ConditionOptionCall<BoolQueryBuilder> opLambda) {
+        not(not -> not.setId_Term(id), opLambda);
     }
 
     public void setId_Terms(Collection<String> idList) {
@@ -198,19 +181,16 @@ public abstract class BsRoleTypeCQ extends EsAbstractConditionQuery {
         setCreatedBy_NotTerm(createdBy, null);
     }
 
-    public void setCreatedBy_NotEqual(String createdBy, ConditionOptionCall<NotQueryBuilder> opLambda) {
-        setCreatedBy_NotTerm(createdBy, opLambda);
-    }
-
     public void setCreatedBy_NotTerm(String createdBy) {
         setCreatedBy_NotTerm(createdBy, null);
     }
 
-    public void setCreatedBy_NotTerm(String createdBy, ConditionOptionCall<NotQueryBuilder> opLambda) {
-        NotQueryBuilder builder = QueryBuilders.notQuery(regTermQ("createdBy", createdBy));
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
+    public void setCreatedBy_NotEqual(String createdBy, ConditionOptionCall<BoolQueryBuilder> opLambda) {
+        setCreatedBy_NotTerm(createdBy, opLambda);
+    }
+
+    public void setCreatedBy_NotTerm(String createdBy, ConditionOptionCall<BoolQueryBuilder> opLambda) {
+        not(not -> not.setCreatedBy_Term(createdBy), opLambda);
     }
 
     public void setCreatedBy_Terms(Collection<String> createdByList) {
@@ -364,19 +344,16 @@ public abstract class BsRoleTypeCQ extends EsAbstractConditionQuery {
         setCreatedTime_NotTerm(createdTime, null);
     }
 
-    public void setCreatedTime_NotEqual(Long createdTime, ConditionOptionCall<NotQueryBuilder> opLambda) {
-        setCreatedTime_NotTerm(createdTime, opLambda);
-    }
-
     public void setCreatedTime_NotTerm(Long createdTime) {
         setCreatedTime_NotTerm(createdTime, null);
     }
 
-    public void setCreatedTime_NotTerm(Long createdTime, ConditionOptionCall<NotQueryBuilder> opLambda) {
-        NotQueryBuilder builder = QueryBuilders.notQuery(regTermQ("createdTime", createdTime));
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
+    public void setCreatedTime_NotEqual(Long createdTime, ConditionOptionCall<BoolQueryBuilder> opLambda) {
+        setCreatedTime_NotTerm(createdTime, opLambda);
+    }
+
+    public void setCreatedTime_NotTerm(Long createdTime, ConditionOptionCall<BoolQueryBuilder> opLambda) {
+        not(not -> not.setCreatedTime_Term(createdTime), opLambda);
     }
 
     public void setCreatedTime_Terms(Collection<Long> createdTimeList) {
@@ -519,19 +496,16 @@ public abstract class BsRoleTypeCQ extends EsAbstractConditionQuery {
         setName_NotTerm(name, null);
     }
 
-    public void setName_NotEqual(String name, ConditionOptionCall<NotQueryBuilder> opLambda) {
-        setName_NotTerm(name, opLambda);
-    }
-
     public void setName_NotTerm(String name) {
         setName_NotTerm(name, null);
     }
 
-    public void setName_NotTerm(String name, ConditionOptionCall<NotQueryBuilder> opLambda) {
-        NotQueryBuilder builder = QueryBuilders.notQuery(regTermQ("name", name));
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
+    public void setName_NotEqual(String name, ConditionOptionCall<BoolQueryBuilder> opLambda) {
+        setName_NotTerm(name, opLambda);
+    }
+
+    public void setName_NotTerm(String name, ConditionOptionCall<BoolQueryBuilder> opLambda) {
+        not(not -> not.setName_Term(name), opLambda);
     }
 
     public void setName_Terms(Collection<String> nameList) {
@@ -685,19 +659,16 @@ public abstract class BsRoleTypeCQ extends EsAbstractConditionQuery {
         setSortOrder_NotTerm(sortOrder, null);
     }
 
-    public void setSortOrder_NotEqual(Integer sortOrder, ConditionOptionCall<NotQueryBuilder> opLambda) {
-        setSortOrder_NotTerm(sortOrder, opLambda);
-    }
-
     public void setSortOrder_NotTerm(Integer sortOrder) {
         setSortOrder_NotTerm(sortOrder, null);
     }
 
-    public void setSortOrder_NotTerm(Integer sortOrder, ConditionOptionCall<NotQueryBuilder> opLambda) {
-        NotQueryBuilder builder = QueryBuilders.notQuery(regTermQ("sortOrder", sortOrder));
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
+    public void setSortOrder_NotEqual(Integer sortOrder, ConditionOptionCall<BoolQueryBuilder> opLambda) {
+        setSortOrder_NotTerm(sortOrder, opLambda);
+    }
+
+    public void setSortOrder_NotTerm(Integer sortOrder, ConditionOptionCall<BoolQueryBuilder> opLambda) {
+        not(not -> not.setSortOrder_Term(sortOrder), opLambda);
     }
 
     public void setSortOrder_Terms(Collection<Integer> sortOrderList) {
@@ -840,19 +811,16 @@ public abstract class BsRoleTypeCQ extends EsAbstractConditionQuery {
         setUpdatedBy_NotTerm(updatedBy, null);
     }
 
-    public void setUpdatedBy_NotEqual(String updatedBy, ConditionOptionCall<NotQueryBuilder> opLambda) {
-        setUpdatedBy_NotTerm(updatedBy, opLambda);
-    }
-
     public void setUpdatedBy_NotTerm(String updatedBy) {
         setUpdatedBy_NotTerm(updatedBy, null);
     }
 
-    public void setUpdatedBy_NotTerm(String updatedBy, ConditionOptionCall<NotQueryBuilder> opLambda) {
-        NotQueryBuilder builder = QueryBuilders.notQuery(regTermQ("updatedBy", updatedBy));
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
+    public void setUpdatedBy_NotEqual(String updatedBy, ConditionOptionCall<BoolQueryBuilder> opLambda) {
+        setUpdatedBy_NotTerm(updatedBy, opLambda);
+    }
+
+    public void setUpdatedBy_NotTerm(String updatedBy, ConditionOptionCall<BoolQueryBuilder> opLambda) {
+        not(not -> not.setUpdatedBy_Term(updatedBy), opLambda);
     }
 
     public void setUpdatedBy_Terms(Collection<String> updatedByList) {
@@ -1006,19 +974,16 @@ public abstract class BsRoleTypeCQ extends EsAbstractConditionQuery {
         setUpdatedTime_NotTerm(updatedTime, null);
     }
 
-    public void setUpdatedTime_NotEqual(Long updatedTime, ConditionOptionCall<NotQueryBuilder> opLambda) {
-        setUpdatedTime_NotTerm(updatedTime, opLambda);
-    }
-
     public void setUpdatedTime_NotTerm(Long updatedTime) {
         setUpdatedTime_NotTerm(updatedTime, null);
     }
 
-    public void setUpdatedTime_NotTerm(Long updatedTime, ConditionOptionCall<NotQueryBuilder> opLambda) {
-        NotQueryBuilder builder = QueryBuilders.notQuery(regTermQ("updatedTime", updatedTime));
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
+    public void setUpdatedTime_NotEqual(Long updatedTime, ConditionOptionCall<BoolQueryBuilder> opLambda) {
+        setUpdatedTime_NotTerm(updatedTime, opLambda);
+    }
+
+    public void setUpdatedTime_NotTerm(Long updatedTime, ConditionOptionCall<BoolQueryBuilder> opLambda) {
+        not(not -> not.setUpdatedTime_Term(updatedTime), opLambda);
     }
 
     public void setUpdatedTime_Terms(Collection<Long> updatedTimeList) {
@@ -1161,19 +1126,16 @@ public abstract class BsRoleTypeCQ extends EsAbstractConditionQuery {
         setValue_NotTerm(value, null);
     }
 
-    public void setValue_NotEqual(String value, ConditionOptionCall<NotQueryBuilder> opLambda) {
-        setValue_NotTerm(value, opLambda);
-    }
-
     public void setValue_NotTerm(String value) {
         setValue_NotTerm(value, null);
     }
 
-    public void setValue_NotTerm(String value, ConditionOptionCall<NotQueryBuilder> opLambda) {
-        NotQueryBuilder builder = QueryBuilders.notQuery(regTermQ("value", value));
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
+    public void setValue_NotEqual(String value, ConditionOptionCall<BoolQueryBuilder> opLambda) {
+        setValue_NotTerm(value, opLambda);
+    }
+
+    public void setValue_NotTerm(String value, ConditionOptionCall<BoolQueryBuilder> opLambda) {
+        not(not -> not.setValue_Term(value), opLambda);
     }
 
     public void setValue_Terms(Collection<String> valueList) {

src/main/java/org/codelibs/fess/es/config/cbean/cq/bs/BsScheduledJobCQ.java

@@ -21,14 +21,11 @@ import java.util.Collection;
 import org.codelibs.fess.es.config.allcommon.EsAbstractConditionQuery;
 import org.codelibs.fess.es.config.cbean.cq.ScheduledJobCQ;
 import org.dbflute.cbean.ckey.ConditionKey;
-import org.dbflute.exception.IllegalConditionBeanOperationException;
 import org.elasticsearch.index.query.BoolQueryBuilder;
 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;
@@ -70,19 +67,8 @@ public abstract class BsScheduledJobCQ extends EsAbstractConditionQuery {
         not(notLambda, null);
     }
 
-    public void not(OperatorCall<ScheduledJobCQ> notLambda, ConditionOptionCall<NotQueryBuilder> opLambda) {
-        ScheduledJobCQ notQuery = new ScheduledJobCQ();
-        notLambda.callback(notQuery);
-        if (notQuery.hasQueries()) {
-            if (notQuery.getQueryBuilderList().size() > 1) {
-                final String msg = "not query must be one query.";
-                throw new IllegalConditionBeanOperationException(msg);
-            }
-            NotQueryBuilder builder = QueryBuilders.notQuery(notQuery.getQueryBuilderList().get(0));
-            if (opLambda != null) {
-                opLambda.callback(builder);
-            }
-        }
+    public void not(final OperatorCall<ScheduledJobCQ> notLambda, final ConditionOptionCall<BoolQueryBuilder> opLambda) {
+        bool((must, should, mustNot, filter) -> notLambda.callback(mustNot), opLambda);
     }
 
     public void bool(BoolCall<ScheduledJobCQ> boolLambda) {
@@ -131,19 +117,16 @@ public abstract class BsScheduledJobCQ extends EsAbstractConditionQuery {
         setId_NotTerm(id, null);
     }
 
-    public void setId_NotEqual(String id, ConditionOptionCall<NotQueryBuilder> opLambda) {
-        setId_NotTerm(id, opLambda);
-    }
-
     public void setId_NotTerm(String id) {
         setId_NotTerm(id, null);
     }
 
-    public void setId_NotTerm(String id, ConditionOptionCall<NotQueryBuilder> opLambda) {
-        NotQueryBuilder builder = QueryBuilders.notQuery(regTermQ("_id", id));
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
+    public void setId_NotEqual(String id, ConditionOptionCall<BoolQueryBuilder> opLambda) {
+        setId_NotTerm(id, opLambda);
+    }
+
+    public void setId_NotTerm(String id, ConditionOptionCall<BoolQueryBuilder> opLambda) {
+        not(not -> not.setId_Term(id), opLambda);
     }
 
     public void setId_Terms(Collection<String> idList) {
@@ -198,19 +181,16 @@ public abstract class BsScheduledJobCQ extends EsAbstractConditionQuery {
         setAvailable_NotTerm(available, null);
     }
 
-    public void setAvailable_NotEqual(Boolean available, ConditionOptionCall<NotQueryBuilder> opLambda) {
-        setAvailable_NotTerm(available, opLambda);
-    }
-
     public void setAvailable_NotTerm(Boolean available) {
         setAvailable_NotTerm(available, null);
     }
 
-    public void setAvailable_NotTerm(Boolean available, ConditionOptionCall<NotQueryBuilder> opLambda) {
-        NotQueryBuilder builder = QueryBuilders.notQuery(regTermQ("available", available));
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
+    public void setAvailable_NotEqual(Boolean available, ConditionOptionCall<BoolQueryBuilder> opLambda) {
+        setAvailable_NotTerm(available, opLambda);
+    }
+
+    public void setAvailable_NotTerm(Boolean available, ConditionOptionCall<BoolQueryBuilder> opLambda) {
+        not(not -> not.setAvailable_Term(available), opLambda);
     }
 
     public void setAvailable_Terms(Collection<Boolean> availableList) {
@@ -353,19 +333,16 @@ public abstract class BsScheduledJobCQ extends EsAbstractConditionQuery {
         setCrawler_NotTerm(crawler, null);
     }
 
-    public void setCrawler_NotEqual(Boolean crawler, ConditionOptionCall<NotQueryBuilder> opLambda) {
-        setCrawler_NotTerm(crawler, opLambda);
-    }
-
     public void setCrawler_NotTerm(Boolean crawler) {
         setCrawler_NotTerm(crawler, null);
     }
 
-    public void setCrawler_NotTerm(Boolean crawler, ConditionOptionCall<NotQueryBuilder> opLambda) {
-        NotQueryBuilder builder = QueryBuilders.notQuery(regTermQ("crawler", crawler));
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
+    public void setCrawler_NotEqual(Boolean crawler, ConditionOptionCall<BoolQueryBuilder> opLambda) {
+        setCrawler_NotTerm(crawler, opLambda);
+    }
+
+    public void setCrawler_NotTerm(Boolean crawler, ConditionOptionCall<BoolQueryBuilder> opLambda) {
+        not(not -> not.setCrawler_Term(crawler), opLambda);
     }
 
     public void setCrawler_Terms(Collection<Boolean> crawlerList) {
@@ -508,19 +485,16 @@ public abstract class BsScheduledJobCQ extends EsAbstractConditionQuery {
         setCreatedBy_NotTerm(createdBy, null);
     }
 
-    public void setCreatedBy_NotEqual(String createdBy, ConditionOptionCall<NotQueryBuilder> opLambda) {
-        setCreatedBy_NotTerm(createdBy, opLambda);
-    }
-
     public void setCreatedBy_NotTerm(String createdBy) {
         setCreatedBy_NotTerm(createdBy, null);
     }
 
-    public void setCreatedBy_NotTerm(String createdBy, ConditionOptionCall<NotQueryBuilder> opLambda) {
-        NotQueryBuilder builder = QueryBuilders.notQuery(regTermQ("createdBy", createdBy));
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
+    public void setCreatedBy_NotEqual(String createdBy, ConditionOptionCall<BoolQueryBuilder> opLambda) {
+        setCreatedBy_NotTerm(createdBy, opLambda);
+    }
+
+    public void setCreatedBy_NotTerm(String createdBy, ConditionOptionCall<BoolQueryBuilder> opLambda) {
+        not(not -> not.setCreatedBy_Term(createdBy), opLambda);
     }
 
     public void setCreatedBy_Terms(Collection<String> createdByList) {
@@ -674,19 +648,16 @@ public abstract class BsScheduledJobCQ extends EsAbstractConditionQuery {
         setCreatedTime_NotTerm(createdTime, null);
     }
 
-    public void setCreatedTime_NotEqual(Long createdTime, ConditionOptionCall<NotQueryBuilder> opLambda) {
-        setCreatedTime_NotTerm(createdTime, opLambda);
-    }
-
     public void setCreatedTime_NotTerm(Long createdTime) {
         setCreatedTime_NotTerm(createdTime, null);
     }
 
-    public void setCreatedTime_NotTerm(Long createdTime, ConditionOptionCall<NotQueryBuilder> opLambda) {
-        NotQueryBuilder builder = QueryBuilders.notQuery(regTermQ("createdTime", createdTime));
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
+    public void setCreatedTime_NotEqual(Long createdTime, ConditionOptionCall<BoolQueryBuilder> opLambda) {
+        setCreatedTime_NotTerm(createdTime, opLambda);
+    }
+
+    public void setCreatedTime_NotTerm(Long createdTime, ConditionOptionCall<BoolQueryBuilder> opLambda) {
+        not(not -> not.setCreatedTime_Term(createdTime), opLambda);
     }
 
     public void setCreatedTime_Terms(Collection<Long> createdTimeList) {
@@ -829,19 +800,16 @@ public abstract class BsScheduledJobCQ extends EsAbstractConditionQuery {
         setCronExpression_NotTerm(cronExpression, null);
     }
 
-    public void setCronExpression_NotEqual(String cronExpression, ConditionOptionCall<NotQueryBuilder> opLambda) {
-        setCronExpression_NotTerm(cronExpression, opLambda);
-    }
-
     public void setCronExpression_NotTerm(String cronExpression) {
         setCronExpression_NotTerm(cronExpression, null);
     }
 
-    public void setCronExpression_NotTerm(String cronExpression, ConditionOptionCall<NotQueryBuilder> opLambda) {
-        NotQueryBuilder builder = QueryBuilders.notQuery(regTermQ("cronExpression", cronExpression));
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
+    public void setCronExpression_NotEqual(String cronExpression, ConditionOptionCall<BoolQueryBuilder> opLambda) {
+        setCronExpression_NotTerm(cronExpression, opLambda);
+    }
+
+    public void setCronExpression_NotTerm(String cronExpression, ConditionOptionCall<BoolQueryBuilder> opLambda) {
+        not(not -> not.setCronExpression_Term(cronExpression), opLambda);
     }
 
     public void setCronExpression_Terms(Collection<String> cronExpressionList) {
@@ -995,19 +963,16 @@ public abstract class BsScheduledJobCQ extends EsAbstractConditionQuery {
         setJobLogging_NotTerm(jobLogging, null);
     }
 
-    public void setJobLogging_NotEqual(Boolean jobLogging, ConditionOptionCall<NotQueryBuilder> opLambda) {
-        setJobLogging_NotTerm(jobLogging, opLambda);
-    }
-
     public void setJobLogging_NotTerm(Boolean jobLogging) {
         setJobLogging_NotTerm(jobLogging, null);
     }
 
-    public void setJobLogging_NotTerm(Boolean jobLogging, ConditionOptionCall<NotQueryBuilder> opLambda) {
-        NotQueryBuilder builder = QueryBuilders.notQuery(regTermQ("jobLogging", jobLogging));
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
+    public void setJobLogging_NotEqual(Boolean jobLogging, ConditionOptionCall<BoolQueryBuilder> opLambda) {
+        setJobLogging_NotTerm(jobLogging, opLambda);
+    }
+
+    public void setJobLogging_NotTerm(Boolean jobLogging, ConditionOptionCall<BoolQueryBuilder> opLambda) {
+        not(not -> not.setJobLogging_Term(jobLogging), opLambda);
     }
 
     public void setJobLogging_Terms(Collection<Boolean> jobLoggingList) {
@@ -1150,19 +1115,16 @@ public abstract class BsScheduledJobCQ extends EsAbstractConditionQuery {
         setName_NotTerm(name, null);
     }
 
-    public void setName_NotEqual(String name, ConditionOptionCall<NotQueryBuilder> opLambda) {
-        setName_NotTerm(name, opLambda);
-    }
-
     public void setName_NotTerm(String name) {
         setName_NotTerm(name, null);
     }
 
-    public void setName_NotTerm(String name, ConditionOptionCall<NotQueryBuilder> opLambda) {
-        NotQueryBuilder builder = QueryBuilders.notQuery(regTermQ("name", name));
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
+    public void setName_NotEqual(String name, ConditionOptionCall<BoolQueryBuilder> opLambda) {
+        setName_NotTerm(name, opLambda);
+    }
+
+    public void setName_NotTerm(String name, ConditionOptionCall<BoolQueryBuilder> opLambda) {
+        not(not -> not.setName_Term(name), opLambda);
     }
 
     public void setName_Terms(Collection<String> nameList) {
@@ -1316,19 +1278,16 @@ public abstract class BsScheduledJobCQ extends EsAbstractConditionQuery {
         setScriptData_NotTerm(scriptData, null);
     }
 
-    public void setScriptData_NotEqual(String scriptData, ConditionOptionCall<NotQueryBuilder> opLambda) {
-        setScriptData_NotTerm(scriptData, opLambda);
-    }
-
     public void setScriptData_NotTerm(String scriptData) {
         setScriptData_NotTerm(scriptData, null);
     }
 
-    public void setScriptData_NotTerm(String scriptData, ConditionOptionCall<NotQueryBuilder> opLambda) {
-        NotQueryBuilder builder = QueryBuilders.notQuery(regTermQ("scriptData", scriptData));
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
+    public void setScriptData_NotEqual(String scriptData, ConditionOptionCall<BoolQueryBuilder> opLambda) {
+        setScriptData_NotTerm(scriptData, opLambda);
+    }
+
+    public void setScriptData_NotTerm(String scriptData, ConditionOptionCall<BoolQueryBuilder> opLambda) {
+        not(not -> not.setScriptData_Term(scriptData), opLambda);
     }
 
     public void setScriptData_Terms(Collection<String> scriptDataList) {
@@ -1482,19 +1441,16 @@ public abstract class BsScheduledJobCQ extends EsAbstractConditionQuery {
         setScriptType_NotTerm(scriptType, null);
     }
 
-    public void setScriptType_NotEqual(String scriptType, ConditionOptionCall<NotQueryBuilder> opLambda) {
-        setScriptType_NotTerm(scriptType, opLambda);
-    }
-
     public void setScriptType_NotTerm(String scriptType) {
         setScriptType_NotTerm(scriptType, null);
     }
 
-    public void setScriptType_NotTerm(String scriptType, ConditionOptionCall<NotQueryBuilder> opLambda) {
-        NotQueryBuilder builder = QueryBuilders.notQuery(regTermQ("scriptType", scriptType));
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
+    public void setScriptType_NotEqual(String scriptType, ConditionOptionCall<BoolQueryBuilder> opLambda) {
+        setScriptType_NotTerm(scriptType, opLambda);
+    }
+
+    public void setScriptType_NotTerm(String scriptType, ConditionOptionCall<BoolQueryBuilder> opLambda) {
+        not(not -> not.setScriptType_Term(scriptType), opLambda);
     }
 
     public void setScriptType_Terms(Collection<String> scriptTypeList) {
@@ -1648,19 +1604,16 @@ public abstract class BsScheduledJobCQ extends EsAbstractConditionQuery {
         setSortOrder_NotTerm(sortOrder, null);
     }
 
-    public void setSortOrder_NotEqual(Integer sortOrder, ConditionOptionCall<NotQueryBuilder> opLambda) {
-        setSortOrder_NotTerm(sortOrder, opLambda);
-    }
-
     public void setSortOrder_NotTerm(Integer sortOrder) {
         setSortOrder_NotTerm(sortOrder, null);
     }
 
-    public void setSortOrder_NotTerm(Integer sortOrder, ConditionOptionCall<NotQueryBuilder> opLambda) {
-        NotQueryBuilder builder = QueryBuilders.notQuery(regTermQ("sortOrder", sortOrder));
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
+    public void setSortOrder_NotEqual(Integer sortOrder, ConditionOptionCall<BoolQueryBuilder> opLambda) {
+        setSortOrder_NotTerm(sortOrder, opLambda);
+    }
+
+    public void setSortOrder_NotTerm(Integer sortOrder, ConditionOptionCall<BoolQueryBuilder> opLambda) {
+        not(not -> not.setSortOrder_Term(sortOrder), opLambda);
     }
 
     public void setSortOrder_Terms(Collection<Integer> sortOrderList) {
@@ -1803,19 +1756,16 @@ public abstract class BsScheduledJobCQ extends EsAbstractConditionQuery {
         setTarget_NotTerm(target, null);
     }
 
-    public void setTarget_NotEqual(String target, ConditionOptionCall<NotQueryBuilder> opLambda) {
-        setTarget_NotTerm(target, opLambda);
-    }
-
     public void setTarget_NotTerm(String target) {
         setTarget_NotTerm(target, null);
     }
 
-    public void setTarget_NotTerm(String target, ConditionOptionCall<NotQueryBuilder> opLambda) {
-        NotQueryBuilder builder = QueryBuilders.notQuery(regTermQ("target", target));
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
+    public void setTarget_NotEqual(String target, ConditionOptionCall<BoolQueryBuilder> opLambda) {
+        setTarget_NotTerm(target, opLambda);
+    }
+
+    public void setTarget_NotTerm(String target, ConditionOptionCall<BoolQueryBuilder> opLambda) {
+        not(not -> not.setTarget_Term(target), opLambda);
     }
 
     public void setTarget_Terms(Collection<String> targetList) {
@@ -1969,19 +1919,16 @@ public abstract class BsScheduledJobCQ extends EsAbstractConditionQuery {
         setUpdatedBy_NotTerm(updatedBy, null);
     }
 
-    public void setUpdatedBy_NotEqual(String updatedBy, ConditionOptionCall<NotQueryBuilder> opLambda) {
-        setUpdatedBy_NotTerm(updatedBy, opLambda);
-    }
-
     public void setUpdatedBy_NotTerm(String updatedBy) {
         setUpdatedBy_NotTerm(updatedBy, null);
     }
 
-    public void setUpdatedBy_NotTerm(String updatedBy, ConditionOptionCall<NotQueryBuilder> opLambda) {
-        NotQueryBuilder builder = QueryBuilders.notQuery(regTermQ("updatedBy", updatedBy));
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
+    public void setUpdatedBy_NotEqual(String updatedBy, ConditionOptionCall<BoolQueryBuilder> opLambda) {
+        setUpdatedBy_NotTerm(updatedBy, opLambda);
+    }
+
+    public void setUpdatedBy_NotTerm(String updatedBy, ConditionOptionCall<BoolQueryBuilder> opLambda) {
+        not(not -> not.setUpdatedBy_Term(updatedBy), opLambda);
     }
 
     public void setUpdatedBy_Terms(Collection<String> updatedByList) {
@@ -2135,19 +2082,16 @@ public abstract class BsScheduledJobCQ extends EsAbstractConditionQuery {
         setUpdatedTime_NotTerm(updatedTime, null);
     }
 
-    public void setUpdatedTime_NotEqual(Long updatedTime, ConditionOptionCall<NotQueryBuilder> opLambda) {
-        setUpdatedTime_NotTerm(updatedTime, opLambda);
-    }
-
     public void setUpdatedTime_NotTerm(Long updatedTime) {
         setUpdatedTime_NotTerm(updatedTime, null);
     }
 
-    public void setUpdatedTime_NotTerm(Long updatedTime, ConditionOptionCall<NotQueryBuilder> opLambda) {
-        NotQueryBuilder builder = QueryBuilders.notQuery(regTermQ("updatedTime", updatedTime));
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
+    public void setUpdatedTime_NotEqual(Long updatedTime, ConditionOptionCall<BoolQueryBuilder> opLambda) {
+        setUpdatedTime_NotTerm(updatedTime, opLambda);
+    }
+
+    public void setUpdatedTime_NotTerm(Long updatedTime, ConditionOptionCall<BoolQueryBuilder> opLambda) {
+        not(not -> not.setUpdatedTime_Term(updatedTime), opLambda);
     }
 
     public void setUpdatedTime_Terms(Collection<Long> updatedTimeList) {

src/main/java/org/codelibs/fess/es/config/cbean/cq/bs/BsWebAuthenticationCQ.java

@@ -21,14 +21,11 @@ import java.util.Collection;
 import org.codelibs.fess.es.config.allcommon.EsAbstractConditionQuery;
 import org.codelibs.fess.es.config.cbean.cq.WebAuthenticationCQ;
 import org.dbflute.cbean.ckey.ConditionKey;
-import org.dbflute.exception.IllegalConditionBeanOperationException;
 import org.elasticsearch.index.query.BoolQueryBuilder;
 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;
@@ -71,19 +68,8 @@ public abstract class BsWebAuthenticationCQ extends EsAbstractConditionQuery {
         not(notLambda, null);
     }
 
-    public void not(OperatorCall<WebAuthenticationCQ> notLambda, ConditionOptionCall<NotQueryBuilder> opLambda) {
-        WebAuthenticationCQ notQuery = new WebAuthenticationCQ();
-        notLambda.callback(notQuery);
-        if (notQuery.hasQueries()) {
-            if (notQuery.getQueryBuilderList().size() > 1) {
-                final String msg = "not query must be one query.";
-                throw new IllegalConditionBeanOperationException(msg);
-            }
-            NotQueryBuilder builder = QueryBuilders.notQuery(notQuery.getQueryBuilderList().get(0));
-            if (opLambda != null) {
-                opLambda.callback(builder);
-            }
-        }
+    public void not(final OperatorCall<WebAuthenticationCQ> notLambda, final ConditionOptionCall<BoolQueryBuilder> opLambda) {
+        bool((must, should, mustNot, filter) -> notLambda.callback(mustNot), opLambda);
     }
 
     public void bool(BoolCall<WebAuthenticationCQ> boolLambda) {
@@ -132,19 +118,16 @@ public abstract class BsWebAuthenticationCQ extends EsAbstractConditionQuery {
         setId_NotTerm(id, null);
     }
 
-    public void setId_NotEqual(String id, ConditionOptionCall<NotQueryBuilder> opLambda) {
-        setId_NotTerm(id, opLambda);
-    }
-
     public void setId_NotTerm(String id) {
         setId_NotTerm(id, null);
     }
 
-    public void setId_NotTerm(String id, ConditionOptionCall<NotQueryBuilder> opLambda) {
-        NotQueryBuilder builder = QueryBuilders.notQuery(regTermQ("_id", id));
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
+    public void setId_NotEqual(String id, ConditionOptionCall<BoolQueryBuilder> opLambda) {
+        setId_NotTerm(id, opLambda);
+    }
+
+    public void setId_NotTerm(String id, ConditionOptionCall<BoolQueryBuilder> opLambda) {
+        not(not -> not.setId_Term(id), opLambda);
     }
 
     public void setId_Terms(Collection<String> idList) {
@@ -199,19 +182,16 @@ public abstract class BsWebAuthenticationCQ extends EsAbstractConditionQuery {
         setAuthRealm_NotTerm(authRealm, null);
     }
 
-    public void setAuthRealm_NotEqual(String authRealm, ConditionOptionCall<NotQueryBuilder> opLambda) {
-        setAuthRealm_NotTerm(authRealm, opLambda);
-    }
-
     public void setAuthRealm_NotTerm(String authRealm) {
         setAuthRealm_NotTerm(authRealm, null);
     }
 
-    public void setAuthRealm_NotTerm(String authRealm, ConditionOptionCall<NotQueryBuilder> opLambda) {
-        NotQueryBuilder builder = QueryBuilders.notQuery(regTermQ("authRealm", authRealm));
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
+    public void setAuthRealm_NotEqual(String authRealm, ConditionOptionCall<BoolQueryBuilder> opLambda) {
+        setAuthRealm_NotTerm(authRealm, opLambda);
+    }
+
+    public void setAuthRealm_NotTerm(String authRealm, ConditionOptionCall<BoolQueryBuilder> opLambda) {
+        not(not -> not.setAuthRealm_Term(authRealm), opLambda);
     }
 
     public void setAuthRealm_Terms(Collection<String> authRealmList) {
@@ -365,19 +345,16 @@ public abstract class BsWebAuthenticationCQ extends EsAbstractConditionQuery {
         setCreatedBy_NotTerm(createdBy, null);
     }
 
-    public void setCreatedBy_NotEqual(String createdBy, ConditionOptionCall<NotQueryBuilder> opLambda) {
-        setCreatedBy_NotTerm(createdBy, opLambda);
-    }
-
     public void setCreatedBy_NotTerm(String createdBy) {
         setCreatedBy_NotTerm(createdBy, null);
     }
 
-    public void setCreatedBy_NotTerm(String createdBy, ConditionOptionCall<NotQueryBuilder> opLambda) {
-        NotQueryBuilder builder = QueryBuilders.notQuery(regTermQ("createdBy", createdBy));
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
+    public void setCreatedBy_NotEqual(String createdBy, ConditionOptionCall<BoolQueryBuilder> opLambda) {
+        setCreatedBy_NotTerm(createdBy, opLambda);
+    }
+
+    public void setCreatedBy_NotTerm(String createdBy, ConditionOptionCall<BoolQueryBuilder> opLambda) {
+        not(not -> not.setCreatedBy_Term(createdBy), opLambda);
     }
 
     public void setCreatedBy_Terms(Collection<String> createdByList) {
@@ -531,19 +508,16 @@ public abstract class BsWebAuthenticationCQ extends EsAbstractConditionQuery {
         setCreatedTime_NotTerm(createdTime, null);
     }
 
-    public void setCreatedTime_NotEqual(Long createdTime, ConditionOptionCall<NotQueryBuilder> opLambda) {
-        setCreatedTime_NotTerm(createdTime, opLambda);
-    }
-
     public void setCreatedTime_NotTerm(Long createdTime) {
         setCreatedTime_NotTerm(createdTime, null);
     }
 
-    public void setCreatedTime_NotTerm(Long createdTime, ConditionOptionCall<NotQueryBuilder> opLambda) {
-        NotQueryBuilder builder = QueryBuilders.notQuery(regTermQ("createdTime", createdTime));
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
+    public void setCreatedTime_NotEqual(Long createdTime, ConditionOptionCall<BoolQueryBuilder> opLambda) {
+        setCreatedTime_NotTerm(createdTime, opLambda);
+    }
+
+    public void setCreatedTime_NotTerm(Long createdTime, ConditionOptionCall<BoolQueryBuilder> opLambda) {
+        not(not -> not.setCreatedTime_Term(createdTime), opLambda);
     }
 
     public void setCreatedTime_Terms(Collection<Long> createdTimeList) {
@@ -686,19 +660,16 @@ public abstract class BsWebAuthenticationCQ extends EsAbstractConditionQuery {
         setHostname_NotTerm(hostname, null);
     }
 
-    public void setHostname_NotEqual(String hostname, ConditionOptionCall<NotQueryBuilder> opLambda) {
-        setHostname_NotTerm(hostname, opLambda);
-    }
-
     public void setHostname_NotTerm(String hostname) {
         setHostname_NotTerm(hostname, null);
     }
 
-    public void setHostname_NotTerm(String hostname, ConditionOptionCall<NotQueryBuilder> opLambda) {
-        NotQueryBuilder builder = QueryBuilders.notQuery(regTermQ("hostname", hostname));
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
+    public void setHostname_NotEqual(String hostname, ConditionOptionCall<BoolQueryBuilder> opLambda) {
+        setHostname_NotTerm(hostname, opLambda);
+    }
+
+    public void setHostname_NotTerm(String hostname, ConditionOptionCall<BoolQueryBuilder> opLambda) {
+        not(not -> not.setHostname_Term(hostname), opLambda);
     }
 
     public void setHostname_Terms(Collection<String> hostnameList) {
@@ -852,19 +823,16 @@ public abstract class BsWebAuthenticationCQ extends EsAbstractConditionQuery {
         setParameters_NotTerm(parameters, null);
     }
 
-    public void setParameters_NotEqual(String parameters, ConditionOptionCall<NotQueryBuilder> opLambda) {
-        setParameters_NotTerm(parameters, opLambda);
-    }
-
     public void setParameters_NotTerm(String parameters) {
         setParameters_NotTerm(parameters, null);
     }
 
-    public void setParameters_NotTerm(String parameters, ConditionOptionCall<NotQueryBuilder> opLambda) {
-        NotQueryBuilder builder = QueryBuilders.notQuery(regTermQ("parameters", parameters));
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
+    public void setParameters_NotEqual(String parameters, ConditionOptionCall<BoolQueryBuilder> opLambda) {
+        setParameters_NotTerm(parameters, opLambda);
+    }
+
+    public void setParameters_NotTerm(String parameters, ConditionOptionCall<BoolQueryBuilder> opLambda) {
+        not(not -> not.setParameters_Term(parameters), opLambda);
     }
 
     public void setParameters_Terms(Collection<String> parametersList) {
@@ -1018,19 +986,16 @@ public abstract class BsWebAuthenticationCQ extends EsAbstractConditionQuery {
         setPassword_NotTerm(password, null);
     }
 
-    public void setPassword_NotEqual(String password, ConditionOptionCall<NotQueryBuilder> opLambda) {
-        setPassword_NotTerm(password, opLambda);
-    }
-
     public void setPassword_NotTerm(String password) {
         setPassword_NotTerm(password, null);
     }
 
-    public void setPassword_NotTerm(String password, ConditionOptionCall<NotQueryBuilder> opLambda) {
-        NotQueryBuilder builder = QueryBuilders.notQuery(regTermQ("password", password));
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
+    public void setPassword_NotEqual(String password, ConditionOptionCall<BoolQueryBuilder> opLambda) {
+        setPassword_NotTerm(password, opLambda);
+    }
+
+    public void setPassword_NotTerm(String password, ConditionOptionCall<BoolQueryBuilder> opLambda) {
+        not(not -> not.setPassword_Term(password), opLambda);
     }
 
     public void setPassword_Terms(Collection<String> passwordList) {
@@ -1184,19 +1149,16 @@ public abstract class BsWebAuthenticationCQ extends EsAbstractConditionQuery {
         setPort_NotTerm(port, null);
     }
 
-    public void setPort_NotEqual(Integer port, ConditionOptionCall<NotQueryBuilder> opLambda) {
-        setPort_NotTerm(port, opLambda);
-    }
-
     public void setPort_NotTerm(Integer port) {
         setPort_NotTerm(port, null);
     }
 
-    public void setPort_NotTerm(Integer port, ConditionOptionCall<NotQueryBuilder> opLambda) {
-        NotQueryBuilder builder = QueryBuilders.notQuery(regTermQ("port", port));
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
+    public void setPort_NotEqual(Integer port, ConditionOptionCall<BoolQueryBuilder> opLambda) {
+        setPort_NotTerm(port, opLambda);
+    }
+
+    public void setPort_NotTerm(Integer port, ConditionOptionCall<BoolQueryBuilder> opLambda) {
+        not(not -> not.setPort_Term(port), opLambda);
     }
 
     public void setPort_Terms(Collection<Integer> portList) {
@@ -1339,19 +1301,16 @@ public abstract class BsWebAuthenticationCQ extends EsAbstractConditionQuery {
         setProtocolScheme_NotTerm(protocolScheme, null);
     }
 
-    public void setProtocolScheme_NotEqual(String protocolScheme, ConditionOptionCall<NotQueryBuilder> opLambda) {
-        setProtocolScheme_NotTerm(protocolScheme, opLambda);
-    }
-
     public void setProtocolScheme_NotTerm(String protocolScheme) {
         setProtocolScheme_NotTerm(protocolScheme, null);
     }
 
-    public void setProtocolScheme_NotTerm(String protocolScheme, ConditionOptionCall<NotQueryBuilder> opLambda) {
-        NotQueryBuilder builder = QueryBuilders.notQuery(regTermQ("protocolScheme", protocolScheme));
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
+    public void setProtocolScheme_NotEqual(String protocolScheme, ConditionOptionCall<BoolQueryBuilder> opLambda) {
+        setProtocolScheme_NotTerm(protocolScheme, opLambda);
+    }
+
+    public void setProtocolScheme_NotTerm(String protocolScheme, ConditionOptionCall<BoolQueryBuilder> opLambda) {
+        not(not -> not.setProtocolScheme_Term(protocolScheme), opLambda);
     }
 
     public void setProtocolScheme_Terms(Collection<String> protocolSchemeList) {
@@ -1505,19 +1464,16 @@ public abstract class BsWebAuthenticationCQ extends EsAbstractConditionQuery {
         setUpdatedBy_NotTerm(updatedBy, null);
     }
 
-    public void setUpdatedBy_NotEqual(String updatedBy, ConditionOptionCall<NotQueryBuilder> opLambda) {
-        setUpdatedBy_NotTerm(updatedBy, opLambda);
-    }
-
     public void setUpdatedBy_NotTerm(String updatedBy) {
         setUpdatedBy_NotTerm(updatedBy, null);
     }
 
-    public void setUpdatedBy_NotTerm(String updatedBy, ConditionOptionCall<NotQueryBuilder> opLambda) {
-        NotQueryBuilder builder = QueryBuilders.notQuery(regTermQ("updatedBy", updatedBy));
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
+    public void setUpdatedBy_NotEqual(String updatedBy, ConditionOptionCall<BoolQueryBuilder> opLambda) {
+        setUpdatedBy_NotTerm(updatedBy, opLambda);
+    }
+
+    public void setUpdatedBy_NotTerm(String updatedBy, ConditionOptionCall<BoolQueryBuilder> opLambda) {
+        not(not -> not.setUpdatedBy_Term(updatedBy), opLambda);
     }
 
     public void setUpdatedBy_Terms(Collection<String> updatedByList) {
@@ -1671,19 +1627,16 @@ public abstract class BsWebAuthenticationCQ extends EsAbstractConditionQuery {
         setUpdatedTime_NotTerm(updatedTime, null);
     }
 
-    public void setUpdatedTime_NotEqual(Long updatedTime, ConditionOptionCall<NotQueryBuilder> opLambda) {
-        setUpdatedTime_NotTerm(updatedTime, opLambda);
-    }
-
     public void setUpdatedTime_NotTerm(Long updatedTime) {
         setUpdatedTime_NotTerm(updatedTime, null);
     }
 
-    public void setUpdatedTime_NotTerm(Long updatedTime, ConditionOptionCall<NotQueryBuilder> opLambda) {
-        NotQueryBuilder builder = QueryBuilders.notQuery(regTermQ("updatedTime", updatedTime));
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
+    public void setUpdatedTime_NotEqual(Long updatedTime, ConditionOptionCall<BoolQueryBuilder> opLambda) {
+        setUpdatedTime_NotTerm(updatedTime, opLambda);
+    }
+
+    public void setUpdatedTime_NotTerm(Long updatedTime, ConditionOptionCall<BoolQueryBuilder> opLambda) {
+        not(not -> not.setUpdatedTime_Term(updatedTime), opLambda);
     }
 
     public void setUpdatedTime_Terms(Collection<Long> updatedTimeList) {
@@ -1826,19 +1779,16 @@ public abstract class BsWebAuthenticationCQ extends EsAbstractConditionQuery {
         setUsername_NotTerm(username, null);
     }
 
-    public void setUsername_NotEqual(String username, ConditionOptionCall<NotQueryBuilder> opLambda) {
-        setUsername_NotTerm(username, opLambda);
-    }
-
     public void setUsername_NotTerm(String username) {
         setUsername_NotTerm(username, null);
     }
 
-    public void setUsername_NotTerm(String username, ConditionOptionCall<NotQueryBuilder> opLambda) {
-        NotQueryBuilder builder = QueryBuilders.notQuery(regTermQ("username", username));
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
+    public void setUsername_NotEqual(String username, ConditionOptionCall<BoolQueryBuilder> opLambda) {
+        setUsername_NotTerm(username, opLambda);
+    }
+
+    public void setUsername_NotTerm(String username, ConditionOptionCall<BoolQueryBuilder> opLambda) {
+        not(not -> not.setUsername_Term(username), opLambda);
     }
 
     public void setUsername_Terms(Collection<String> usernameList) {
@@ -1992,19 +1942,16 @@ public abstract class BsWebAuthenticationCQ extends EsAbstractConditionQuery {
         setWebConfigId_NotTerm(webConfigId, null);
     }
 
-    public void setWebConfigId_NotEqual(String webConfigId, ConditionOptionCall<NotQueryBuilder> opLambda) {
-        setWebConfigId_NotTerm(webConfigId, opLambda);
-    }
-
     public void setWebConfigId_NotTerm(String webConfigId) {
         setWebConfigId_NotTerm(webConfigId, null);
     }
 
-    public void setWebConfigId_NotTerm(String webConfigId, ConditionOptionCall<NotQueryBuilder> opLambda) {
-        NotQueryBuilder builder = QueryBuilders.notQuery(regTermQ("webConfigId", webConfigId));
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
+    public void setWebConfigId_NotEqual(String webConfigId, ConditionOptionCall<BoolQueryBuilder> opLambda) {
+        setWebConfigId_NotTerm(webConfigId, opLambda);
+    }
+
+    public void setWebConfigId_NotTerm(String webConfigId, ConditionOptionCall<BoolQueryBuilder> opLambda) {
+        not(not -> not.setWebConfigId_Term(webConfigId), opLambda);
     }
 
     public void setWebConfigId_Terms(Collection<String> webConfigIdList) {

src/main/java/org/codelibs/fess/es/config/cbean/cq/bs/BsWebConfigCQ.java

@@ -21,14 +21,11 @@ import java.util.Collection;
 import org.codelibs.fess.es.config.allcommon.EsAbstractConditionQuery;
 import org.codelibs.fess.es.config.cbean.cq.WebConfigCQ;
 import org.dbflute.cbean.ckey.ConditionKey;
-import org.dbflute.exception.IllegalConditionBeanOperationException;
 import org.elasticsearch.index.query.BoolQueryBuilder;
 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;
@@ -70,19 +67,8 @@ public abstract class BsWebConfigCQ extends EsAbstractConditionQuery {
         not(notLambda, null);
     }
 
-    public void not(OperatorCall<WebConfigCQ> notLambda, ConditionOptionCall<NotQueryBuilder> opLambda) {
-        WebConfigCQ notQuery = new WebConfigCQ();
-        notLambda.callback(notQuery);
-        if (notQuery.hasQueries()) {
-            if (notQuery.getQueryBuilderList().size() > 1) {
-                final String msg = "not query must be one query.";
-                throw new IllegalConditionBeanOperationException(msg);
-            }
-            NotQueryBuilder builder = QueryBuilders.notQuery(notQuery.getQueryBuilderList().get(0));
-            if (opLambda != null) {
-                opLambda.callback(builder);
-            }
-        }
+    public void not(final OperatorCall<WebConfigCQ> notLambda, final ConditionOptionCall<BoolQueryBuilder> opLambda) {
+        bool((must, should, mustNot, filter) -> notLambda.callback(mustNot), opLambda);
     }
 
     public void bool(BoolCall<WebConfigCQ> boolLambda) {
@@ -131,19 +117,16 @@ public abstract class BsWebConfigCQ extends EsAbstractConditionQuery {
         setId_NotTerm(id, null);
     }
 
-    public void setId_NotEqual(String id, ConditionOptionCall<NotQueryBuilder> opLambda) {
-        setId_NotTerm(id, opLambda);
-    }
-
     public void setId_NotTerm(String id) {
         setId_NotTerm(id, null);
     }
 
-    public void setId_NotTerm(String id, ConditionOptionCall<NotQueryBuilder> opLambda) {
-        NotQueryBuilder builder = QueryBuilders.notQuery(regTermQ("_id", id));
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
+    public void setId_NotEqual(String id, ConditionOptionCall<BoolQueryBuilder> opLambda) {
+        setId_NotTerm(id, opLambda);
+    }
+
+    public void setId_NotTerm(String id, ConditionOptionCall<BoolQueryBuilder> opLambda) {
+        not(not -> not.setId_Term(id), opLambda);
     }
 
     public void setId_Terms(Collection<String> idList) {
@@ -198,19 +181,16 @@ public abstract class BsWebConfigCQ extends EsAbstractConditionQuery {
         setAvailable_NotTerm(available, null);
     }
 
-    public void setAvailable_NotEqual(Boolean available, ConditionOptionCall<NotQueryBuilder> opLambda) {
-        setAvailable_NotTerm(available, opLambda);
-    }
-
     public void setAvailable_NotTerm(Boolean available) {
         setAvailable_NotTerm(available, null);
     }
 
-    public void setAvailable_NotTerm(Boolean available, ConditionOptionCall<NotQueryBuilder> opLambda) {
-        NotQueryBuilder builder = QueryBuilders.notQuery(regTermQ("available", available));
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
+    public void setAvailable_NotEqual(Boolean available, ConditionOptionCall<BoolQueryBuilder> opLambda) {
+        setAvailable_NotTerm(available, opLambda);
+    }
+
+    public void setAvailable_NotTerm(Boolean available, ConditionOptionCall<BoolQueryBuilder> opLambda) {
+        not(not -> not.setAvailable_Term(available), opLambda);
     }
 
     public void setAvailable_Terms(Collection<Boolean> availableList) {
@@ -353,19 +333,16 @@ public abstract class BsWebConfigCQ extends EsAbstractConditionQuery {
         setBoost_NotTerm(boost, null);
     }
 
-    public void setBoost_NotEqual(Float boost, ConditionOptionCall<NotQueryBuilder> opLambda) {
-        setBoost_NotTerm(boost, opLambda);
-    }
-
     public void setBoost_NotTerm(Float boost) {
         setBoost_NotTerm(boost, null);
     }
 
-    public void setBoost_NotTerm(Float boost, ConditionOptionCall<NotQueryBuilder> opLambda) {
-        NotQueryBuilder builder = QueryBuilders.notQuery(regTermQ("boost", boost));
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
+    public void setBoost_NotEqual(Float boost, ConditionOptionCall<BoolQueryBuilder> opLambda) {
+        setBoost_NotTerm(boost, opLambda);
+    }
+
+    public void setBoost_NotTerm(Float boost, ConditionOptionCall<BoolQueryBuilder> opLambda) {
+        not(not -> not.setBoost_Term(boost), opLambda);
     }
 
     public void setBoost_Terms(Collection<Float> boostList) {
@@ -508,19 +485,16 @@ public abstract class BsWebConfigCQ extends EsAbstractConditionQuery {
         setConfigParameter_NotTerm(configParameter, null);
     }
 
-    public void setConfigParameter_NotEqual(String configParameter, ConditionOptionCall<NotQueryBuilder> opLambda) {
-        setConfigParameter_NotTerm(configParameter, opLambda);
-    }
-
     public void setConfigParameter_NotTerm(String configParameter) {
         setConfigParameter_NotTerm(configParameter, null);
     }
 
-    public void setConfigParameter_NotTerm(String configParameter, ConditionOptionCall<NotQueryBuilder> opLambda) {
-        NotQueryBuilder builder = QueryBuilders.notQuery(regTermQ("configParameter", configParameter));
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
+    public void setConfigParameter_NotEqual(String configParameter, ConditionOptionCall<BoolQueryBuilder> opLambda) {
+        setConfigParameter_NotTerm(configParameter, opLambda);
+    }
+
+    public void setConfigParameter_NotTerm(String configParameter, ConditionOptionCall<BoolQueryBuilder> opLambda) {
+        not(not -> not.setConfigParameter_Term(configParameter), opLambda);
     }
 
     public void setConfigParameter_Terms(Collection<String> configParameterList) {
@@ -674,19 +648,16 @@ public abstract class BsWebConfigCQ extends EsAbstractConditionQuery {
         setCreatedBy_NotTerm(createdBy, null);
     }
 
-    public void setCreatedBy_NotEqual(String createdBy, ConditionOptionCall<NotQueryBuilder> opLambda) {
-        setCreatedBy_NotTerm(createdBy, opLambda);
-    }
-
     public void setCreatedBy_NotTerm(String createdBy) {
         setCreatedBy_NotTerm(createdBy, null);
     }
 
-    public void setCreatedBy_NotTerm(String createdBy, ConditionOptionCall<NotQueryBuilder> opLambda) {
-        NotQueryBuilder builder = QueryBuilders.notQuery(regTermQ("createdBy", createdBy));
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
+    public void setCreatedBy_NotEqual(String createdBy, ConditionOptionCall<BoolQueryBuilder> opLambda) {
+        setCreatedBy_NotTerm(createdBy, opLambda);
+    }
+
+    public void setCreatedBy_NotTerm(String createdBy, ConditionOptionCall<BoolQueryBuilder> opLambda) {
+        not(not -> not.setCreatedBy_Term(createdBy), opLambda);
     }
 
     public void setCreatedBy_Terms(Collection<String> createdByList) {
@@ -840,19 +811,16 @@ public abstract class BsWebConfigCQ extends EsAbstractConditionQuery {
         setCreatedTime_NotTerm(createdTime, null);
     }
 
-    public void setCreatedTime_NotEqual(Long createdTime, ConditionOptionCall<NotQueryBuilder> opLambda) {
-        setCreatedTime_NotTerm(createdTime, opLambda);
-    }
-
     public void setCreatedTime_NotTerm(Long createdTime) {
         setCreatedTime_NotTerm(createdTime, null);
     }
 
-    public void setCreatedTime_NotTerm(Long createdTime, ConditionOptionCall<NotQueryBuilder> opLambda) {
-        NotQueryBuilder builder = QueryBuilders.notQuery(regTermQ("createdTime", createdTime));
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
+    public void setCreatedTime_NotEqual(Long createdTime, ConditionOptionCall<BoolQueryBuilder> opLambda) {
+        setCreatedTime_NotTerm(createdTime, opLambda);
+    }
+
+    public void setCreatedTime_NotTerm(Long createdTime, ConditionOptionCall<BoolQueryBuilder> opLambda) {
+        not(not -> not.setCreatedTime_Term(createdTime), opLambda);
     }
 
     public void setCreatedTime_Terms(Collection<Long> createdTimeList) {
@@ -995,19 +963,16 @@ public abstract class BsWebConfigCQ extends EsAbstractConditionQuery {
         setDepth_NotTerm(depth, null);
     }
 
-    public void setDepth_NotEqual(Integer depth, ConditionOptionCall<NotQueryBuilder> opLambda) {
-        setDepth_NotTerm(depth, opLambda);
-    }
-
     public void setDepth_NotTerm(Integer depth) {
         setDepth_NotTerm(depth, null);
     }
 
-    public void setDepth_NotTerm(Integer depth, ConditionOptionCall<NotQueryBuilder> opLambda) {
-        NotQueryBuilder builder = QueryBuilders.notQuery(regTermQ("depth", depth));
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
+    public void setDepth_NotEqual(Integer depth, ConditionOptionCall<BoolQueryBuilder> opLambda) {
+        setDepth_NotTerm(depth, opLambda);
+    }
+
+    public void setDepth_NotTerm(Integer depth, ConditionOptionCall<BoolQueryBuilder> opLambda) {
+        not(not -> not.setDepth_Term(depth), opLambda);
     }
 
     public void setDepth_Terms(Collection<Integer> depthList) {
@@ -1150,19 +1115,16 @@ public abstract class BsWebConfigCQ extends EsAbstractConditionQuery {
         setExcludedDocUrls_NotTerm(excludedDocUrls, null);
     }
 
-    public void setExcludedDocUrls_NotEqual(String excludedDocUrls, ConditionOptionCall<NotQueryBuilder> opLambda) {
-        setExcludedDocUrls_NotTerm(excludedDocUrls, opLambda);
-    }
-
     public void setExcludedDocUrls_NotTerm(String excludedDocUrls) {
         setExcludedDocUrls_NotTerm(excludedDocUrls, null);
     }
 
-    public void setExcludedDocUrls_NotTerm(String excludedDocUrls, ConditionOptionCall<NotQueryBuilder> opLambda) {
-        NotQueryBuilder builder = QueryBuilders.notQuery(regTermQ("excludedDocUrls", excludedDocUrls));
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
+    public void setExcludedDocUrls_NotEqual(String excludedDocUrls, ConditionOptionCall<BoolQueryBuilder> opLambda) {
+        setExcludedDocUrls_NotTerm(excludedDocUrls, opLambda);
+    }
+
+    public void setExcludedDocUrls_NotTerm(String excludedDocUrls, ConditionOptionCall<BoolQueryBuilder> opLambda) {
+        not(not -> not.setExcludedDocUrls_Term(excludedDocUrls), opLambda);
     }
 
     public void setExcludedDocUrls_Terms(Collection<String> excludedDocUrlsList) {
@@ -1316,19 +1278,16 @@ public abstract class BsWebConfigCQ extends EsAbstractConditionQuery {
         setExcludedUrls_NotTerm(excludedUrls, null);
     }
 
-    public void setExcludedUrls_NotEqual(String excludedUrls, ConditionOptionCall<NotQueryBuilder> opLambda) {
-        setExcludedUrls_NotTerm(excludedUrls, opLambda);
-    }
-
     public void setExcludedUrls_NotTerm(String excludedUrls) {
         setExcludedUrls_NotTerm(excludedUrls, null);
     }
 
-    public void setExcludedUrls_NotTerm(String excludedUrls, ConditionOptionCall<NotQueryBuilder> opLambda) {
-        NotQueryBuilder builder = QueryBuilders.notQuery(regTermQ("excludedUrls", excludedUrls));
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
+    public void setExcludedUrls_NotEqual(String excludedUrls, ConditionOptionCall<BoolQueryBuilder> opLambda) {
+        setExcludedUrls_NotTerm(excludedUrls, opLambda);
+    }
+
+    public void setExcludedUrls_NotTerm(String excludedUrls, ConditionOptionCall<BoolQueryBuilder> opLambda) {
+        not(not -> not.setExcludedUrls_Term(excludedUrls), opLambda);
     }
 
     public void setExcludedUrls_Terms(Collection<String> excludedUrlsList) {
@@ -1482,19 +1441,16 @@ public abstract class BsWebConfigCQ extends EsAbstractConditionQuery {
         setIncludedDocUrls_NotTerm(includedDocUrls, null);
     }
 
-    public void setIncludedDocUrls_NotEqual(String includedDocUrls, ConditionOptionCall<NotQueryBuilder> opLambda) {
-        setIncludedDocUrls_NotTerm(includedDocUrls, opLambda);
-    }
-
     public void setIncludedDocUrls_NotTerm(String includedDocUrls) {
         setIncludedDocUrls_NotTerm(includedDocUrls, null);
     }
 
-    public void setIncludedDocUrls_NotTerm(String includedDocUrls, ConditionOptionCall<NotQueryBuilder> opLambda) {
-        NotQueryBuilder builder = QueryBuilders.notQuery(regTermQ("includedDocUrls", includedDocUrls));
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
+    public void setIncludedDocUrls_NotEqual(String includedDocUrls, ConditionOptionCall<BoolQueryBuilder> opLambda) {
+        setIncludedDocUrls_NotTerm(includedDocUrls, opLambda);
+    }
+
+    public void setIncludedDocUrls_NotTerm(String includedDocUrls, ConditionOptionCall<BoolQueryBuilder> opLambda) {
+        not(not -> not.setIncludedDocUrls_Term(includedDocUrls), opLambda);
     }
 
     public void setIncludedDocUrls_Terms(Collection<String> includedDocUrlsList) {
@@ -1648,19 +1604,16 @@ public abstract class BsWebConfigCQ extends EsAbstractConditionQuery {
         setIncludedUrls_NotTerm(includedUrls, null);
     }
 
-    public void setIncludedUrls_NotEqual(String includedUrls, ConditionOptionCall<NotQueryBuilder> opLambda) {
-        setIncludedUrls_NotTerm(includedUrls, opLambda);
-    }
-
     public void setIncludedUrls_NotTerm(String includedUrls) {
         setIncludedUrls_NotTerm(includedUrls, null);
     }
 
-    public void setIncludedUrls_NotTerm(String includedUrls, ConditionOptionCall<NotQueryBuilder> opLambda) {
-        NotQueryBuilder builder = QueryBuilders.notQuery(regTermQ("includedUrls", includedUrls));
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
+    public void setIncludedUrls_NotEqual(String includedUrls, ConditionOptionCall<BoolQueryBuilder> opLambda) {
+        setIncludedUrls_NotTerm(includedUrls, opLambda);
+    }
+
+    public void setIncludedUrls_NotTerm(String includedUrls, ConditionOptionCall<BoolQueryBuilder> opLambda) {
+        not(not -> not.setIncludedUrls_Term(includedUrls), opLambda);
     }
 
     public void setIncludedUrls_Terms(Collection<String> includedUrlsList) {
@@ -1814,19 +1767,16 @@ public abstract class BsWebConfigCQ extends EsAbstractConditionQuery {
         setIntervalTime_NotTerm(intervalTime, null);
     }
 
-    public void setIntervalTime_NotEqual(Integer intervalTime, ConditionOptionCall<NotQueryBuilder> opLambda) {
-        setIntervalTime_NotTerm(intervalTime, opLambda);
-    }
-
     public void setIntervalTime_NotTerm(Integer intervalTime) {
         setIntervalTime_NotTerm(intervalTime, null);
     }
 
-    public void setIntervalTime_NotTerm(Integer intervalTime, ConditionOptionCall<NotQueryBuilder> opLambda) {
-        NotQueryBuilder builder = QueryBuilders.notQuery(regTermQ("intervalTime", intervalTime));
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
+    public void setIntervalTime_NotEqual(Integer intervalTime, ConditionOptionCall<BoolQueryBuilder> opLambda) {
+        setIntervalTime_NotTerm(intervalTime, opLambda);
+    }
+
+    public void setIntervalTime_NotTerm(Integer intervalTime, ConditionOptionCall<BoolQueryBuilder> opLambda) {
+        not(not -> not.setIntervalTime_Term(intervalTime), opLambda);
     }
 
     public void setIntervalTime_Terms(Collection<Integer> intervalTimeList) {
@@ -1969,19 +1919,16 @@ public abstract class BsWebConfigCQ extends EsAbstractConditionQuery {
         setTimeToLive_NotTerm(timeToLive, null);
     }
 
-    public void setTimeToLive_NotEqual(Integer timeToLive, ConditionOptionCall<NotQueryBuilder> opLambda) {
-        setTimeToLive_NotTerm(timeToLive, opLambda);
-    }
-
     public void setTimeToLive_NotTerm(Integer timeToLive) {
         setTimeToLive_NotTerm(timeToLive, null);
     }
 
-    public void setTimeToLive_NotTerm(Integer timeToLive, ConditionOptionCall<NotQueryBuilder> opLambda) {
-        NotQueryBuilder builder = QueryBuilders.notQuery(regTermQ("timeToLive", timeToLive));
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
+    public void setTimeToLive_NotEqual(Integer timeToLive, ConditionOptionCall<BoolQueryBuilder> opLambda) {
+        setTimeToLive_NotTerm(timeToLive, opLambda);
+    }
+
+    public void setTimeToLive_NotTerm(Integer timeToLive, ConditionOptionCall<BoolQueryBuilder> opLambda) {
+        not(not -> not.setTimeToLive_Term(timeToLive), opLambda);
     }
 
     public void setTimeToLive_Terms(Collection<Integer> timeToLiveList) {
@@ -2124,19 +2071,16 @@ public abstract class BsWebConfigCQ extends EsAbstractConditionQuery {
         setMaxAccessCount_NotTerm(maxAccessCount, null);
     }
 
-    public void setMaxAccessCount_NotEqual(Long maxAccessCount, ConditionOptionCall<NotQueryBuilder> opLambda) {
-        setMaxAccessCount_NotTerm(maxAccessCount, opLambda);
-    }
-
     public void setMaxAccessCount_NotTerm(Long maxAccessCount) {
         setMaxAccessCount_NotTerm(maxAccessCount, null);
     }
 
-    public void setMaxAccessCount_NotTerm(Long maxAccessCount, ConditionOptionCall<NotQueryBuilder> opLambda) {
-        NotQueryBuilder builder = QueryBuilders.notQuery(regTermQ("maxAccessCount", maxAccessCount));
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
+    public void setMaxAccessCount_NotEqual(Long maxAccessCount, ConditionOptionCall<BoolQueryBuilder> opLambda) {
+        setMaxAccessCount_NotTerm(maxAccessCount, opLambda);
+    }
+
+    public void setMaxAccessCount_NotTerm(Long maxAccessCount, ConditionOptionCall<BoolQueryBuilder> opLambda) {
+        not(not -> not.setMaxAccessCount_Term(maxAccessCount), opLambda);
     }
 
     public void setMaxAccessCount_Terms(Collection<Long> maxAccessCountList) {
@@ -2279,19 +2223,16 @@ public abstract class BsWebConfigCQ extends EsAbstractConditionQuery {
         setName_NotTerm(name, null);
     }
 
-    public void setName_NotEqual(String name, ConditionOptionCall<NotQueryBuilder> opLambda) {
-        setName_NotTerm(name, opLambda);
-    }
-
     public void setName_NotTerm(String name) {
         setName_NotTerm(name, null);
     }
 
-    public void setName_NotTerm(String name, ConditionOptionCall<NotQueryBuilder> opLambda) {
-        NotQueryBuilder builder = QueryBuilders.notQuery(regTermQ("name", name));
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
+    public void setName_NotEqual(String name, ConditionOptionCall<BoolQueryBuilder> opLambda) {
+        setName_NotTerm(name, opLambda);
+    }
+
+    public void setName_NotTerm(String name, ConditionOptionCall<BoolQueryBuilder> opLambda) {
+        not(not -> not.setName_Term(name), opLambda);
     }
 
     public void setName_Terms(Collection<String> nameList) {
@@ -2445,19 +2386,16 @@ public abstract class BsWebConfigCQ extends EsAbstractConditionQuery {
         setNumOfThread_NotTerm(numOfThread, null);
     }
 
-    public void setNumOfThread_NotEqual(Integer numOfThread, ConditionOptionCall<NotQueryBuilder> opLambda) {
-        setNumOfThread_NotTerm(numOfThread, opLambda);
-    }
-
     public void setNumOfThread_NotTerm(Integer numOfThread) {
         setNumOfThread_NotTerm(numOfThread, null);
     }
 
-    public void setNumOfThread_NotTerm(Integer numOfThread, ConditionOptionCall<NotQueryBuilder> opLambda) {
-        NotQueryBuilder builder = QueryBuilders.notQuery(regTermQ("numOfThread", numOfThread));
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
+    public void setNumOfThread_NotEqual(Integer numOfThread, ConditionOptionCall<BoolQueryBuilder> opLambda) {
+        setNumOfThread_NotTerm(numOfThread, opLambda);
+    }
+
+    public void setNumOfThread_NotTerm(Integer numOfThread, ConditionOptionCall<BoolQueryBuilder> opLambda) {
+        not(not -> not.setNumOfThread_Term(numOfThread), opLambda);
     }
 
     public void setNumOfThread_Terms(Collection<Integer> numOfThreadList) {
@@ -2600,19 +2538,16 @@ public abstract class BsWebConfigCQ extends EsAbstractConditionQuery {
         setPermissions_NotTerm(permissions, null);
     }
 
-    public void setPermissions_NotEqual(String permissions, ConditionOptionCall<NotQueryBuilder> opLambda) {
-        setPermissions_NotTerm(permissions, opLambda);
-    }
-
     public void setPermissions_NotTerm(String permissions) {
         setPermissions_NotTerm(permissions, null);
     }
 
-    public void setPermissions_NotTerm(String permissions, ConditionOptionCall<NotQueryBuilder> opLambda) {
-        NotQueryBuilder builder = QueryBuilders.notQuery(regTermQ("permissions", permissions));
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
+    public void setPermissions_NotEqual(String permissions, ConditionOptionCall<BoolQueryBuilder> opLambda) {
+        setPermissions_NotTerm(permissions, opLambda);
+    }
+
+    public void setPermissions_NotTerm(String permissions, ConditionOptionCall<BoolQueryBuilder> opLambda) {
+        not(not -> not.setPermissions_Term(permissions), opLambda);
     }
 
     public void setPermissions_Terms(Collection<String> permissionsList) {
@@ -2766,19 +2701,16 @@ public abstract class BsWebConfigCQ extends EsAbstractConditionQuery {
         setSortOrder_NotTerm(sortOrder, null);
     }
 
-    public void setSortOrder_NotEqual(Integer sortOrder, ConditionOptionCall<NotQueryBuilder> opLambda) {
-        setSortOrder_NotTerm(sortOrder, opLambda);
-    }
-
     public void setSortOrder_NotTerm(Integer sortOrder) {
         setSortOrder_NotTerm(sortOrder, null);
     }
 
-    public void setSortOrder_NotTerm(Integer sortOrder, ConditionOptionCall<NotQueryBuilder> opLambda) {
-        NotQueryBuilder builder = QueryBuilders.notQuery(regTermQ("sortOrder", sortOrder));
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
+    public void setSortOrder_NotEqual(Integer sortOrder, ConditionOptionCall<BoolQueryBuilder> opLambda) {
+        setSortOrder_NotTerm(sortOrder, opLambda);
+    }
+
+    public void setSortOrder_NotTerm(Integer sortOrder, ConditionOptionCall<BoolQueryBuilder> opLambda) {
+        not(not -> not.setSortOrder_Term(sortOrder), opLambda);
     }
 
     public void setSortOrder_Terms(Collection<Integer> sortOrderList) {
@@ -2921,19 +2853,16 @@ public abstract class BsWebConfigCQ extends EsAbstractConditionQuery {
         setUpdatedBy_NotTerm(updatedBy, null);
     }
 
-    public void setUpdatedBy_NotEqual(String updatedBy, ConditionOptionCall<NotQueryBuilder> opLambda) {
-        setUpdatedBy_NotTerm(updatedBy, opLambda);
-    }
-
     public void setUpdatedBy_NotTerm(String updatedBy) {
         setUpdatedBy_NotTerm(updatedBy, null);
     }
 
-    public void setUpdatedBy_NotTerm(String updatedBy, ConditionOptionCall<NotQueryBuilder> opLambda) {
-        NotQueryBuilder builder = QueryBuilders.notQuery(regTermQ("updatedBy", updatedBy));
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
+    public void setUpdatedBy_NotEqual(String updatedBy, ConditionOptionCall<BoolQueryBuilder> opLambda) {
+        setUpdatedBy_NotTerm(updatedBy, opLambda);
+    }
+
+    public void setUpdatedBy_NotTerm(String updatedBy, ConditionOptionCall<BoolQueryBuilder> opLambda) {
+        not(not -> not.setUpdatedBy_Term(updatedBy), opLambda);
     }
 
     public void setUpdatedBy_Terms(Collection<String> updatedByList) {
@@ -3087,19 +3016,16 @@ public abstract class BsWebConfigCQ extends EsAbstractConditionQuery {
         setUpdatedTime_NotTerm(updatedTime, null);
     }
 
-    public void setUpdatedTime_NotEqual(Long updatedTime, ConditionOptionCall<NotQueryBuilder> opLambda) {
-        setUpdatedTime_NotTerm(updatedTime, opLambda);
-    }
-
     public void setUpdatedTime_NotTerm(Long updatedTime) {
         setUpdatedTime_NotTerm(updatedTime, null);
     }
 
-    public void setUpdatedTime_NotTerm(Long updatedTime, ConditionOptionCall<NotQueryBuilder> opLambda) {
-        NotQueryBuilder builder = QueryBuilders.notQuery(regTermQ("updatedTime", updatedTime));
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
+    public void setUpdatedTime_NotEqual(Long updatedTime, ConditionOptionCall<BoolQueryBuilder> opLambda) {
+        setUpdatedTime_NotTerm(updatedTime, opLambda);
+    }
+
+    public void setUpdatedTime_NotTerm(Long updatedTime, ConditionOptionCall<BoolQueryBuilder> opLambda) {
+        not(not -> not.setUpdatedTime_Term(updatedTime), opLambda);
     }
 
     public void setUpdatedTime_Terms(Collection<Long> updatedTimeList) {
@@ -3242,19 +3168,16 @@ public abstract class BsWebConfigCQ extends EsAbstractConditionQuery {
         setUrls_NotTerm(urls, null);
     }
 
-    public void setUrls_NotEqual(String urls, ConditionOptionCall<NotQueryBuilder> opLambda) {
-        setUrls_NotTerm(urls, opLambda);
-    }
-
     public void setUrls_NotTerm(String urls) {
         setUrls_NotTerm(urls, null);
     }
 
-    public void setUrls_NotTerm(String urls, ConditionOptionCall<NotQueryBuilder> opLambda) {
-        NotQueryBuilder builder = QueryBuilders.notQuery(regTermQ("urls", urls));
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
+    public void setUrls_NotEqual(String urls, ConditionOptionCall<BoolQueryBuilder> opLambda) {
+        setUrls_NotTerm(urls, opLambda);
+    }
+
+    public void setUrls_NotTerm(String urls, ConditionOptionCall<BoolQueryBuilder> opLambda) {
+        not(not -> not.setUrls_Term(urls), opLambda);
     }
 
     public void setUrls_Terms(Collection<String> urlsList) {
@@ -3408,19 +3331,16 @@ public abstract class BsWebConfigCQ extends EsAbstractConditionQuery {
         setUserAgent_NotTerm(userAgent, null);
     }
 
-    public void setUserAgent_NotEqual(String userAgent, ConditionOptionCall<NotQueryBuilder> opLambda) {
-        setUserAgent_NotTerm(userAgent, opLambda);
-    }
-
     public void setUserAgent_NotTerm(String userAgent) {
         setUserAgent_NotTerm(userAgent, null);
     }
 
-    public void setUserAgent_NotTerm(String userAgent, ConditionOptionCall<NotQueryBuilder> opLambda) {
-        NotQueryBuilder builder = QueryBuilders.notQuery(regTermQ("userAgent", userAgent));
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
+    public void setUserAgent_NotEqual(String userAgent, ConditionOptionCall<BoolQueryBuilder> opLambda) {
+        setUserAgent_NotTerm(userAgent, opLambda);
+    }
+
+    public void setUserAgent_NotTerm(String userAgent, ConditionOptionCall<BoolQueryBuilder> opLambda) {
+        not(not -> not.setUserAgent_Term(userAgent), opLambda);
     }
 
     public void setUserAgent_Terms(Collection<String> userAgentList) {

src/main/java/org/codelibs/fess/es/config/cbean/cq/bs/BsWebConfigToLabelCQ.java

@@ -21,14 +21,11 @@ import java.util.Collection;
 import org.codelibs.fess.es.config.allcommon.EsAbstractConditionQuery;
 import org.codelibs.fess.es.config.cbean.cq.WebConfigToLabelCQ;
 import org.dbflute.cbean.ckey.ConditionKey;
-import org.dbflute.exception.IllegalConditionBeanOperationException;
 import org.elasticsearch.index.query.BoolQueryBuilder;
 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;
@@ -70,19 +67,8 @@ public abstract class BsWebConfigToLabelCQ extends EsAbstractConditionQuery {
         not(notLambda, null);
     }
 
-    public void not(OperatorCall<WebConfigToLabelCQ> notLambda, ConditionOptionCall<NotQueryBuilder> opLambda) {
-        WebConfigToLabelCQ notQuery = new WebConfigToLabelCQ();
-        notLambda.callback(notQuery);
-        if (notQuery.hasQueries()) {
-            if (notQuery.getQueryBuilderList().size() > 1) {
-                final String msg = "not query must be one query.";
-                throw new IllegalConditionBeanOperationException(msg);
-            }
-            NotQueryBuilder builder = QueryBuilders.notQuery(notQuery.getQueryBuilderList().get(0));
-            if (opLambda != null) {
-                opLambda.callback(builder);
-            }
-        }
+    public void not(final OperatorCall<WebConfigToLabelCQ> notLambda, final ConditionOptionCall<BoolQueryBuilder> opLambda) {
+        bool((must, should, mustNot, filter) -> notLambda.callback(mustNot), opLambda);
     }
 
     public void bool(BoolCall<WebConfigToLabelCQ> boolLambda) {
@@ -131,19 +117,16 @@ public abstract class BsWebConfigToLabelCQ extends EsAbstractConditionQuery {
         setId_NotTerm(id, null);
     }
 
-    public void setId_NotEqual(String id, ConditionOptionCall<NotQueryBuilder> opLambda) {
-        setId_NotTerm(id, opLambda);
-    }
-
     public void setId_NotTerm(String id) {
         setId_NotTerm(id, null);
     }
 
-    public void setId_NotTerm(String id, ConditionOptionCall<NotQueryBuilder> opLambda) {
-        NotQueryBuilder builder = QueryBuilders.notQuery(regTermQ("_id", id));
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
+    public void setId_NotEqual(String id, ConditionOptionCall<BoolQueryBuilder> opLambda) {
+        setId_NotTerm(id, opLambda);
+    }
+
+    public void setId_NotTerm(String id, ConditionOptionCall<BoolQueryBuilder> opLambda) {
+        not(not -> not.setId_Term(id), opLambda);
     }
 
     public void setId_Terms(Collection<String> idList) {
@@ -198,19 +181,16 @@ public abstract class BsWebConfigToLabelCQ extends EsAbstractConditionQuery {
         setLabelTypeId_NotTerm(labelTypeId, null);
     }
 
-    public void setLabelTypeId_NotEqual(String labelTypeId, ConditionOptionCall<NotQueryBuilder> opLambda) {
-        setLabelTypeId_NotTerm(labelTypeId, opLambda);
-    }
-
     public void setLabelTypeId_NotTerm(String labelTypeId) {
         setLabelTypeId_NotTerm(labelTypeId, null);
     }
 
-    public void setLabelTypeId_NotTerm(String labelTypeId, ConditionOptionCall<NotQueryBuilder> opLambda) {
-        NotQueryBuilder builder = QueryBuilders.notQuery(regTermQ("labelTypeId", labelTypeId));
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
+    public void setLabelTypeId_NotEqual(String labelTypeId, ConditionOptionCall<BoolQueryBuilder> opLambda) {
+        setLabelTypeId_NotTerm(labelTypeId, opLambda);
+    }
+
+    public void setLabelTypeId_NotTerm(String labelTypeId, ConditionOptionCall<BoolQueryBuilder> opLambda) {
+        not(not -> not.setLabelTypeId_Term(labelTypeId), opLambda);
     }
 
     public void setLabelTypeId_Terms(Collection<String> labelTypeIdList) {
@@ -364,19 +344,16 @@ public abstract class BsWebConfigToLabelCQ extends EsAbstractConditionQuery {
         setWebConfigId_NotTerm(webConfigId, null);
     }
 
-    public void setWebConfigId_NotEqual(String webConfigId, ConditionOptionCall<NotQueryBuilder> opLambda) {
-        setWebConfigId_NotTerm(webConfigId, opLambda);
-    }
-
     public void setWebConfigId_NotTerm(String webConfigId) {
         setWebConfigId_NotTerm(webConfigId, null);
     }
 
-    public void setWebConfigId_NotTerm(String webConfigId, ConditionOptionCall<NotQueryBuilder> opLambda) {
-        NotQueryBuilder builder = QueryBuilders.notQuery(regTermQ("webConfigId", webConfigId));
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
+    public void setWebConfigId_NotEqual(String webConfigId, ConditionOptionCall<BoolQueryBuilder> opLambda) {
+        setWebConfigId_NotTerm(webConfigId, opLambda);
+    }
+
+    public void setWebConfigId_NotTerm(String webConfigId, ConditionOptionCall<BoolQueryBuilder> opLambda) {
+        not(not -> not.setWebConfigId_Term(webConfigId), opLambda);
     }
 
     public void setWebConfigId_Terms(Collection<String> webConfigIdList) {

src/main/java/org/codelibs/fess/es/config/cbean/cq/bs/BsWebConfigToRoleCQ.java

@@ -21,14 +21,11 @@ import java.util.Collection;
 import org.codelibs.fess.es.config.allcommon.EsAbstractConditionQuery;
 import org.codelibs.fess.es.config.cbean.cq.WebConfigToRoleCQ;
 import org.dbflute.cbean.ckey.ConditionKey;
-import org.dbflute.exception.IllegalConditionBeanOperationException;
 import org.elasticsearch.index.query.BoolQueryBuilder;
 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;
@@ -70,19 +67,8 @@ public abstract class BsWebConfigToRoleCQ extends EsAbstractConditionQuery {
         not(notLambda, null);
     }
 
-    public void not(OperatorCall<WebConfigToRoleCQ> notLambda, ConditionOptionCall<NotQueryBuilder> opLambda) {
-        WebConfigToRoleCQ notQuery = new WebConfigToRoleCQ();
-        notLambda.callback(notQuery);
-        if (notQuery.hasQueries()) {
-            if (notQuery.getQueryBuilderList().size() > 1) {
-                final String msg = "not query must be one query.";
-                throw new IllegalConditionBeanOperationException(msg);
-            }
-            NotQueryBuilder builder = QueryBuilders.notQuery(notQuery.getQueryBuilderList().get(0));
-            if (opLambda != null) {
-                opLambda.callback(builder);
-            }
-        }
+    public void not(final OperatorCall<WebConfigToRoleCQ> notLambda, final ConditionOptionCall<BoolQueryBuilder> opLambda) {
+        bool((must, should, mustNot, filter) -> notLambda.callback(mustNot), opLambda);
     }
 
     public void bool(BoolCall<WebConfigToRoleCQ> boolLambda) {
@@ -131,19 +117,16 @@ public abstract class BsWebConfigToRoleCQ extends EsAbstractConditionQuery {
         setId_NotTerm(id, null);
     }
 
-    public void setId_NotEqual(String id, ConditionOptionCall<NotQueryBuilder> opLambda) {
-        setId_NotTerm(id, opLambda);
-    }
-
     public void setId_NotTerm(String id) {
         setId_NotTerm(id, null);
     }
 
-    public void setId_NotTerm(String id, ConditionOptionCall<NotQueryBuilder> opLambda) {
-        NotQueryBuilder builder = QueryBuilders.notQuery(regTermQ("_id", id));
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
+    public void setId_NotEqual(String id, ConditionOptionCall<BoolQueryBuilder> opLambda) {
+        setId_NotTerm(id, opLambda);
+    }
+
+    public void setId_NotTerm(String id, ConditionOptionCall<BoolQueryBuilder> opLambda) {
+        not(not -> not.setId_Term(id), opLambda);
     }
 
     public void setId_Terms(Collection<String> idList) {
@@ -198,19 +181,16 @@ public abstract class BsWebConfigToRoleCQ extends EsAbstractConditionQuery {
         setRoleTypeId_NotTerm(roleTypeId, null);
     }
 
-    public void setRoleTypeId_NotEqual(String roleTypeId, ConditionOptionCall<NotQueryBuilder> opLambda) {
-        setRoleTypeId_NotTerm(roleTypeId, opLambda);
-    }
-
     public void setRoleTypeId_NotTerm(String roleTypeId) {
         setRoleTypeId_NotTerm(roleTypeId, null);
     }
 
-    public void setRoleTypeId_NotTerm(String roleTypeId, ConditionOptionCall<NotQueryBuilder> opLambda) {
-        NotQueryBuilder builder = QueryBuilders.notQuery(regTermQ("roleTypeId", roleTypeId));
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
+    public void setRoleTypeId_NotEqual(String roleTypeId, ConditionOptionCall<BoolQueryBuilder> opLambda) {
+        setRoleTypeId_NotTerm(roleTypeId, opLambda);
+    }
+
+    public void setRoleTypeId_NotTerm(String roleTypeId, ConditionOptionCall<BoolQueryBuilder> opLambda) {
+        not(not -> not.setRoleTypeId_Term(roleTypeId), opLambda);
     }
 
     public void setRoleTypeId_Terms(Collection<String> roleTypeIdList) {
@@ -364,19 +344,16 @@ public abstract class BsWebConfigToRoleCQ extends EsAbstractConditionQuery {
         setWebConfigId_NotTerm(webConfigId, null);
     }
 
-    public void setWebConfigId_NotEqual(String webConfigId, ConditionOptionCall<NotQueryBuilder> opLambda) {
-        setWebConfigId_NotTerm(webConfigId, opLambda);
-    }
-
     public void setWebConfigId_NotTerm(String webConfigId) {
         setWebConfigId_NotTerm(webConfigId, null);
     }
 
-    public void setWebConfigId_NotTerm(String webConfigId, ConditionOptionCall<NotQueryBuilder> opLambda) {
-        NotQueryBuilder builder = QueryBuilders.notQuery(regTermQ("webConfigId", webConfigId));
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
+    public void setWebConfigId_NotEqual(String webConfigId, ConditionOptionCall<BoolQueryBuilder> opLambda) {
+        setWebConfigId_NotTerm(webConfigId, opLambda);
+    }
+
+    public void setWebConfigId_NotTerm(String webConfigId, ConditionOptionCall<BoolQueryBuilder> opLambda) {
+        not(not -> not.setWebConfigId_Term(webConfigId), opLambda);
     }
 
     public void setWebConfigId_Terms(Collection<String> webConfigIdList) {

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

@@ -37,7 +37,6 @@ import org.dbflute.dbmeta.accessory.DerivedTypeHandler;
 import org.dbflute.jdbc.StatementConfig;
 import org.dbflute.system.DBFluteSystem;
 import org.dbflute.twowaysql.style.BoundDateDisplayStyle;
-import org.elasticsearch.action.count.CountRequestBuilder;
 import org.elasticsearch.action.search.SearchRequestBuilder;
 import org.elasticsearch.common.unit.TimeValue;
 
@@ -57,8 +56,6 @@ public abstract class EsAbstractConditionBean implements ConditionBean {
     // ===================================================================================
     //                                                                             Builder
     //                                                                             =======
-    public abstract CountRequestBuilder build(CountRequestBuilder builder);
-
     public abstract SearchRequestBuilder build(SearchRequestBuilder builder);
 
     // ===================================================================================

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

@@ -476,6 +476,6 @@ public abstract class EsAbstractConditionQuery implements ConditionQuery {
     @FunctionalInterface
     public interface OperatorCall<CQ extends EsAbstractConditionQuery> {
 
-        void callback(CQ and);
+        void callback(CQ query);
     }
 }

src/main/java/org/codelibs/fess/es/log/cbean/bs/BsClickLogCB.java

@@ -25,7 +25,6 @@ import org.codelibs.fess.es.log.cbean.ClickLogCB;
 import org.codelibs.fess.es.log.cbean.cq.ClickLogCQ;
 import org.codelibs.fess.es.log.cbean.cq.bs.BsClickLogCQ;
 import org.dbflute.cbean.ConditionQuery;
-import org.elasticsearch.action.count.CountRequestBuilder;
 import org.elasticsearch.action.search.SearchRequestBuilder;
 import org.elasticsearch.index.query.QueryBuilder;
 
@@ -81,16 +80,6 @@ public class BsClickLogCB extends EsAbstractConditionBean {
     // ===================================================================================
     //                                                                               Build
     //                                                                               =====
-    @Override
-    public CountRequestBuilder build(CountRequestBuilder builder) {
-        if (_conditionQuery != null) {
-            QueryBuilder queryBuilder = _conditionQuery.getQuery();
-            if (queryBuilder != null) {
-                builder.setQuery(queryBuilder);
-            }
-        }
-        return builder;
-    }
 
     @Override
     public SearchRequestBuilder build(SearchRequestBuilder builder) {

src/main/java/org/codelibs/fess/es/log/cbean/bs/BsFavoriteLogCB.java

@@ -25,7 +25,6 @@ import org.codelibs.fess.es.log.cbean.FavoriteLogCB;
 import org.codelibs.fess.es.log.cbean.cq.FavoriteLogCQ;
 import org.codelibs.fess.es.log.cbean.cq.bs.BsFavoriteLogCQ;
 import org.dbflute.cbean.ConditionQuery;
-import org.elasticsearch.action.count.CountRequestBuilder;
 import org.elasticsearch.action.search.SearchRequestBuilder;
 import org.elasticsearch.index.query.QueryBuilder;
 
@@ -81,16 +80,6 @@ public class BsFavoriteLogCB extends EsAbstractConditionBean {
     // ===================================================================================
     //                                                                               Build
     //                                                                               =====
-    @Override
-    public CountRequestBuilder build(CountRequestBuilder builder) {
-        if (_conditionQuery != null) {
-            QueryBuilder queryBuilder = _conditionQuery.getQuery();
-            if (queryBuilder != null) {
-                builder.setQuery(queryBuilder);
-            }
-        }
-        return builder;
-    }
 
     @Override
     public SearchRequestBuilder build(SearchRequestBuilder builder) {

src/main/java/org/codelibs/fess/es/log/cbean/bs/BsSearchFieldLogCB.java

@@ -25,7 +25,6 @@ import org.codelibs.fess.es.log.cbean.SearchFieldLogCB;
 import org.codelibs.fess.es.log.cbean.cq.SearchFieldLogCQ;
 import org.codelibs.fess.es.log.cbean.cq.bs.BsSearchFieldLogCQ;
 import org.dbflute.cbean.ConditionQuery;
-import org.elasticsearch.action.count.CountRequestBuilder;
 import org.elasticsearch.action.search.SearchRequestBuilder;
 import org.elasticsearch.index.query.QueryBuilder;
 
@@ -81,16 +80,6 @@ public class BsSearchFieldLogCB extends EsAbstractConditionBean {
     // ===================================================================================
     //                                                                               Build
     //                                                                               =====
-    @Override
-    public CountRequestBuilder build(CountRequestBuilder builder) {
-        if (_conditionQuery != null) {
-            QueryBuilder queryBuilder = _conditionQuery.getQuery();
-            if (queryBuilder != null) {
-                builder.setQuery(queryBuilder);
-            }
-        }
-        return builder;
-    }
 
     @Override
     public SearchRequestBuilder build(SearchRequestBuilder builder) {

src/main/java/org/codelibs/fess/es/log/cbean/bs/BsSearchLogCB.java

@@ -25,7 +25,6 @@ import org.codelibs.fess.es.log.cbean.SearchLogCB;
 import org.codelibs.fess.es.log.cbean.cq.SearchLogCQ;
 import org.codelibs.fess.es.log.cbean.cq.bs.BsSearchLogCQ;
 import org.dbflute.cbean.ConditionQuery;
-import org.elasticsearch.action.count.CountRequestBuilder;
 import org.elasticsearch.action.search.SearchRequestBuilder;
 import org.elasticsearch.index.query.QueryBuilder;
 
@@ -81,16 +80,6 @@ public class BsSearchLogCB extends EsAbstractConditionBean {
     // ===================================================================================
     //                                                                               Build
     //                                                                               =====
-    @Override
-    public CountRequestBuilder build(CountRequestBuilder builder) {
-        if (_conditionQuery != null) {
-            QueryBuilder queryBuilder = _conditionQuery.getQuery();
-            if (queryBuilder != null) {
-                builder.setQuery(queryBuilder);
-            }
-        }
-        return builder;
-    }
 
     @Override
     public SearchRequestBuilder build(SearchRequestBuilder builder) {

src/main/java/org/codelibs/fess/es/log/cbean/bs/BsUserInfoCB.java

@@ -25,7 +25,6 @@ import org.codelibs.fess.es.log.cbean.UserInfoCB;
 import org.codelibs.fess.es.log.cbean.cq.UserInfoCQ;
 import org.codelibs.fess.es.log.cbean.cq.bs.BsUserInfoCQ;
 import org.dbflute.cbean.ConditionQuery;
-import org.elasticsearch.action.count.CountRequestBuilder;
 import org.elasticsearch.action.search.SearchRequestBuilder;
 import org.elasticsearch.index.query.QueryBuilder;
 
@@ -81,16 +80,6 @@ public class BsUserInfoCB extends EsAbstractConditionBean {
     // ===================================================================================
     //                                                                               Build
     //                                                                               =====
-    @Override
-    public CountRequestBuilder build(CountRequestBuilder builder) {
-        if (_conditionQuery != null) {
-            QueryBuilder queryBuilder = _conditionQuery.getQuery();
-            if (queryBuilder != null) {
-                builder.setQuery(queryBuilder);
-            }
-        }
-        return builder;
-    }
 
     @Override
     public SearchRequestBuilder build(SearchRequestBuilder builder) {

src/main/java/org/codelibs/fess/es/log/cbean/cq/bs/BsClickLogCQ.java

@@ -21,14 +21,11 @@ import java.util.Collection;
 import org.codelibs.fess.es.log.allcommon.EsAbstractConditionQuery;
 import org.codelibs.fess.es.log.cbean.cq.ClickLogCQ;
 import org.dbflute.cbean.ckey.ConditionKey;
-import org.dbflute.exception.IllegalConditionBeanOperationException;
 import org.elasticsearch.index.query.BoolQueryBuilder;
 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;
@@ -70,19 +67,8 @@ public abstract class BsClickLogCQ extends EsAbstractConditionQuery {
         not(notLambda, null);
     }
 
-    public void not(OperatorCall<ClickLogCQ> notLambda, ConditionOptionCall<NotQueryBuilder> opLambda) {
-        ClickLogCQ notQuery = new ClickLogCQ();
-        notLambda.callback(notQuery);
-        if (notQuery.hasQueries()) {
-            if (notQuery.getQueryBuilderList().size() > 1) {
-                final String msg = "not query must be one query.";
-                throw new IllegalConditionBeanOperationException(msg);
-            }
-            NotQueryBuilder builder = QueryBuilders.notQuery(notQuery.getQueryBuilderList().get(0));
-            if (opLambda != null) {
-                opLambda.callback(builder);
-            }
-        }
+    public void not(final OperatorCall<ClickLogCQ> notLambda, final ConditionOptionCall<BoolQueryBuilder> opLambda) {
+        bool((must, should, mustNot, filter) -> notLambda.callback(mustNot), opLambda);
     }
 
     public void bool(BoolCall<ClickLogCQ> boolLambda) {
@@ -131,19 +117,16 @@ public abstract class BsClickLogCQ extends EsAbstractConditionQuery {
         setId_NotTerm(id, null);
     }
 
-    public void setId_NotEqual(String id, ConditionOptionCall<NotQueryBuilder> opLambda) {
-        setId_NotTerm(id, opLambda);
-    }
-
     public void setId_NotTerm(String id) {
         setId_NotTerm(id, null);
     }
 
-    public void setId_NotTerm(String id, ConditionOptionCall<NotQueryBuilder> opLambda) {
-        NotQueryBuilder builder = QueryBuilders.notQuery(regTermQ("_id", id));
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
+    public void setId_NotEqual(String id, ConditionOptionCall<BoolQueryBuilder> opLambda) {
+        setId_NotTerm(id, opLambda);
+    }
+
+    public void setId_NotTerm(String id, ConditionOptionCall<BoolQueryBuilder> opLambda) {
+        not(not -> not.setId_Term(id), opLambda);
     }
 
     public void setId_Terms(Collection<String> idList) {
@@ -198,19 +181,16 @@ public abstract class BsClickLogCQ extends EsAbstractConditionQuery {
         setQueryRequestedAt_NotTerm(queryRequestedAt, null);
     }
 
-    public void setQueryRequestedAt_NotEqual(LocalDateTime queryRequestedAt, ConditionOptionCall<NotQueryBuilder> opLambda) {
-        setQueryRequestedAt_NotTerm(queryRequestedAt, opLambda);
-    }
-
     public void setQueryRequestedAt_NotTerm(LocalDateTime queryRequestedAt) {
         setQueryRequestedAt_NotTerm(queryRequestedAt, null);
     }
 
-    public void setQueryRequestedAt_NotTerm(LocalDateTime queryRequestedAt, ConditionOptionCall<NotQueryBuilder> opLambda) {
-        NotQueryBuilder builder = QueryBuilders.notQuery(regTermQ("queryRequestedAt", queryRequestedAt));
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
+    public void setQueryRequestedAt_NotEqual(LocalDateTime queryRequestedAt, ConditionOptionCall<BoolQueryBuilder> opLambda) {
+        setQueryRequestedAt_NotTerm(queryRequestedAt, opLambda);
+    }
+
+    public void setQueryRequestedAt_NotTerm(LocalDateTime queryRequestedAt, ConditionOptionCall<BoolQueryBuilder> opLambda) {
+        not(not -> not.setQueryRequestedAt_Term(queryRequestedAt), opLambda);
     }
 
     public void setQueryRequestedAt_Terms(Collection<LocalDateTime> queryRequestedAtList) {
@@ -353,19 +333,16 @@ public abstract class BsClickLogCQ extends EsAbstractConditionQuery {
         setRequestedAt_NotTerm(requestedAt, null);
     }
 
-    public void setRequestedAt_NotEqual(LocalDateTime requestedAt, ConditionOptionCall<NotQueryBuilder> opLambda) {
-        setRequestedAt_NotTerm(requestedAt, opLambda);
-    }
-
     public void setRequestedAt_NotTerm(LocalDateTime requestedAt) {
         setRequestedAt_NotTerm(requestedAt, null);
     }
 
-    public void setRequestedAt_NotTerm(LocalDateTime requestedAt, ConditionOptionCall<NotQueryBuilder> opLambda) {
-        NotQueryBuilder builder = QueryBuilders.notQuery(regTermQ("requestedAt", requestedAt));
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
+    public void setRequestedAt_NotEqual(LocalDateTime requestedAt, ConditionOptionCall<BoolQueryBuilder> opLambda) {
+        setRequestedAt_NotTerm(requestedAt, opLambda);
+    }
+
+    public void setRequestedAt_NotTerm(LocalDateTime requestedAt, ConditionOptionCall<BoolQueryBuilder> opLambda) {
+        not(not -> not.setRequestedAt_Term(requestedAt), opLambda);
     }
 
     public void setRequestedAt_Terms(Collection<LocalDateTime> requestedAtList) {
@@ -508,19 +485,16 @@ public abstract class BsClickLogCQ extends EsAbstractConditionQuery {
         setQueryId_NotTerm(queryId, null);
     }
 
-    public void setQueryId_NotEqual(String queryId, ConditionOptionCall<NotQueryBuilder> opLambda) {
-        setQueryId_NotTerm(queryId, opLambda);
-    }
-
     public void setQueryId_NotTerm(String queryId) {
         setQueryId_NotTerm(queryId, null);
     }
 
-    public void setQueryId_NotTerm(String queryId, ConditionOptionCall<NotQueryBuilder> opLambda) {
-        NotQueryBuilder builder = QueryBuilders.notQuery(regTermQ("queryId", queryId));
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
+    public void setQueryId_NotEqual(String queryId, ConditionOptionCall<BoolQueryBuilder> opLambda) {
+        setQueryId_NotTerm(queryId, opLambda);
+    }
+
+    public void setQueryId_NotTerm(String queryId, ConditionOptionCall<BoolQueryBuilder> opLambda) {
+        not(not -> not.setQueryId_Term(queryId), opLambda);
     }
 
     public void setQueryId_Terms(Collection<String> queryIdList) {
@@ -674,19 +648,16 @@ public abstract class BsClickLogCQ extends EsAbstractConditionQuery {
         setDocId_NotTerm(docId, null);
     }
 
-    public void setDocId_NotEqual(String docId, ConditionOptionCall<NotQueryBuilder> opLambda) {
-        setDocId_NotTerm(docId, opLambda);
-    }
-
     public void setDocId_NotTerm(String docId) {
         setDocId_NotTerm(docId, null);
     }
 
-    public void setDocId_NotTerm(String docId, ConditionOptionCall<NotQueryBuilder> opLambda) {
-        NotQueryBuilder builder = QueryBuilders.notQuery(regTermQ("docId", docId));
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
+    public void setDocId_NotEqual(String docId, ConditionOptionCall<BoolQueryBuilder> opLambda) {
+        setDocId_NotTerm(docId, opLambda);
+    }
+
+    public void setDocId_NotTerm(String docId, ConditionOptionCall<BoolQueryBuilder> opLambda) {
+        not(not -> not.setDocId_Term(docId), opLambda);
     }
 
     public void setDocId_Terms(Collection<String> docIdList) {
@@ -840,19 +811,16 @@ public abstract class BsClickLogCQ extends EsAbstractConditionQuery {
         setUserSessionId_NotTerm(userSessionId, null);
     }
 
-    public void setUserSessionId_NotEqual(String userSessionId, ConditionOptionCall<NotQueryBuilder> opLambda) {
-        setUserSessionId_NotTerm(userSessionId, opLambda);
-    }
-
     public void setUserSessionId_NotTerm(String userSessionId) {
         setUserSessionId_NotTerm(userSessionId, null);
     }
 
-    public void setUserSessionId_NotTerm(String userSessionId, ConditionOptionCall<NotQueryBuilder> opLambda) {
-        NotQueryBuilder builder = QueryBuilders.notQuery(regTermQ("userSessionId", userSessionId));
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
+    public void setUserSessionId_NotEqual(String userSessionId, ConditionOptionCall<BoolQueryBuilder> opLambda) {
+        setUserSessionId_NotTerm(userSessionId, opLambda);
+    }
+
+    public void setUserSessionId_NotTerm(String userSessionId, ConditionOptionCall<BoolQueryBuilder> opLambda) {
+        not(not -> not.setUserSessionId_Term(userSessionId), opLambda);
     }
 
     public void setUserSessionId_Terms(Collection<String> userSessionIdList) {
@@ -1006,19 +974,16 @@ public abstract class BsClickLogCQ extends EsAbstractConditionQuery {
         setUrl_NotTerm(url, null);
     }
 
-    public void setUrl_NotEqual(String url, ConditionOptionCall<NotQueryBuilder> opLambda) {
-        setUrl_NotTerm(url, opLambda);
-    }
-
     public void setUrl_NotTerm(String url) {
         setUrl_NotTerm(url, null);
     }
 
-    public void setUrl_NotTerm(String url, ConditionOptionCall<NotQueryBuilder> opLambda) {
-        NotQueryBuilder builder = QueryBuilders.notQuery(regTermQ("url", url));
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
+    public void setUrl_NotEqual(String url, ConditionOptionCall<BoolQueryBuilder> opLambda) {
+        setUrl_NotTerm(url, opLambda);
+    }
+
+    public void setUrl_NotTerm(String url, ConditionOptionCall<BoolQueryBuilder> opLambda) {
+        not(not -> not.setUrl_Term(url), opLambda);
     }
 
     public void setUrl_Terms(Collection<String> urlList) {
@@ -1172,19 +1137,16 @@ public abstract class BsClickLogCQ extends EsAbstractConditionQuery {
         setOrder_NotTerm(order, null);
     }
 
-    public void setOrder_NotEqual(Integer order, ConditionOptionCall<NotQueryBuilder> opLambda) {
-        setOrder_NotTerm(order, opLambda);
-    }
-
     public void setOrder_NotTerm(Integer order) {
         setOrder_NotTerm(order, null);
     }
 
-    public void setOrder_NotTerm(Integer order, ConditionOptionCall<NotQueryBuilder> opLambda) {
-        NotQueryBuilder builder = QueryBuilders.notQuery(regTermQ("order", order));
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
+    public void setOrder_NotEqual(Integer order, ConditionOptionCall<BoolQueryBuilder> opLambda) {
+        setOrder_NotTerm(order, opLambda);
+    }
+
+    public void setOrder_NotTerm(Integer order, ConditionOptionCall<BoolQueryBuilder> opLambda) {
+        not(not -> not.setOrder_Term(order), opLambda);
     }
 
     public void setOrder_Terms(Collection<Integer> orderList) {

src/main/java/org/codelibs/fess/es/log/cbean/cq/bs/BsFavoriteLogCQ.java

@@ -21,14 +21,11 @@ import java.util.Collection;
 import org.codelibs.fess.es.log.allcommon.EsAbstractConditionQuery;
 import org.codelibs.fess.es.log.cbean.cq.FavoriteLogCQ;
 import org.dbflute.cbean.ckey.ConditionKey;
-import org.dbflute.exception.IllegalConditionBeanOperationException;
 import org.elasticsearch.index.query.BoolQueryBuilder;
 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;
@@ -70,19 +67,8 @@ public abstract class BsFavoriteLogCQ extends EsAbstractConditionQuery {
         not(notLambda, null);
     }
 
-    public void not(OperatorCall<FavoriteLogCQ> notLambda, ConditionOptionCall<NotQueryBuilder> opLambda) {
-        FavoriteLogCQ notQuery = new FavoriteLogCQ();
-        notLambda.callback(notQuery);
-        if (notQuery.hasQueries()) {
-            if (notQuery.getQueryBuilderList().size() > 1) {
-                final String msg = "not query must be one query.";
-                throw new IllegalConditionBeanOperationException(msg);
-            }
-            NotQueryBuilder builder = QueryBuilders.notQuery(notQuery.getQueryBuilderList().get(0));
-            if (opLambda != null) {
-                opLambda.callback(builder);
-            }
-        }
+    public void not(final OperatorCall<FavoriteLogCQ> notLambda, final ConditionOptionCall<BoolQueryBuilder> opLambda) {
+        bool((must, should, mustNot, filter) -> notLambda.callback(mustNot), opLambda);
     }
 
     public void bool(BoolCall<FavoriteLogCQ> boolLambda) {
@@ -131,19 +117,16 @@ public abstract class BsFavoriteLogCQ extends EsAbstractConditionQuery {
         setId_NotTerm(id, null);
     }
 
-    public void setId_NotEqual(String id, ConditionOptionCall<NotQueryBuilder> opLambda) {
-        setId_NotTerm(id, opLambda);
-    }
-
     public void setId_NotTerm(String id) {
         setId_NotTerm(id, null);
     }
 
-    public void setId_NotTerm(String id, ConditionOptionCall<NotQueryBuilder> opLambda) {
-        NotQueryBuilder builder = QueryBuilders.notQuery(regTermQ("_id", id));
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
+    public void setId_NotEqual(String id, ConditionOptionCall<BoolQueryBuilder> opLambda) {
+        setId_NotTerm(id, opLambda);
+    }
+
+    public void setId_NotTerm(String id, ConditionOptionCall<BoolQueryBuilder> opLambda) {
+        not(not -> not.setId_Term(id), opLambda);
     }
 
     public void setId_Terms(Collection<String> idList) {
@@ -198,19 +181,16 @@ public abstract class BsFavoriteLogCQ extends EsAbstractConditionQuery {
         setCreatedAt_NotTerm(createdAt, null);
     }
 
-    public void setCreatedAt_NotEqual(LocalDateTime createdAt, ConditionOptionCall<NotQueryBuilder> opLambda) {
-        setCreatedAt_NotTerm(createdAt, opLambda);
-    }
-
     public void setCreatedAt_NotTerm(LocalDateTime createdAt) {
         setCreatedAt_NotTerm(createdAt, null);
     }
 
-    public void setCreatedAt_NotTerm(LocalDateTime createdAt, ConditionOptionCall<NotQueryBuilder> opLambda) {
-        NotQueryBuilder builder = QueryBuilders.notQuery(regTermQ("createdAt", createdAt));
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
+    public void setCreatedAt_NotEqual(LocalDateTime createdAt, ConditionOptionCall<BoolQueryBuilder> opLambda) {
+        setCreatedAt_NotTerm(createdAt, opLambda);
+    }
+
+    public void setCreatedAt_NotTerm(LocalDateTime createdAt, ConditionOptionCall<BoolQueryBuilder> opLambda) {
+        not(not -> not.setCreatedAt_Term(createdAt), opLambda);
     }
 
     public void setCreatedAt_Terms(Collection<LocalDateTime> createdAtList) {
@@ -353,19 +333,16 @@ public abstract class BsFavoriteLogCQ extends EsAbstractConditionQuery {
         setUrl_NotTerm(url, null);
     }
 
-    public void setUrl_NotEqual(String url, ConditionOptionCall<NotQueryBuilder> opLambda) {
-        setUrl_NotTerm(url, opLambda);
-    }
-
     public void setUrl_NotTerm(String url) {
         setUrl_NotTerm(url, null);
     }
 
-    public void setUrl_NotTerm(String url, ConditionOptionCall<NotQueryBuilder> opLambda) {
-        NotQueryBuilder builder = QueryBuilders.notQuery(regTermQ("url", url));
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
+    public void setUrl_NotEqual(String url, ConditionOptionCall<BoolQueryBuilder> opLambda) {
+        setUrl_NotTerm(url, opLambda);
+    }
+
+    public void setUrl_NotTerm(String url, ConditionOptionCall<BoolQueryBuilder> opLambda) {
+        not(not -> not.setUrl_Term(url), opLambda);
     }
 
     public void setUrl_Terms(Collection<String> urlList) {
@@ -519,19 +496,16 @@ public abstract class BsFavoriteLogCQ extends EsAbstractConditionQuery {
         setDocId_NotTerm(docId, null);
     }
 
-    public void setDocId_NotEqual(String docId, ConditionOptionCall<NotQueryBuilder> opLambda) {
-        setDocId_NotTerm(docId, opLambda);
-    }
-
     public void setDocId_NotTerm(String docId) {
         setDocId_NotTerm(docId, null);
     }
 
-    public void setDocId_NotTerm(String docId, ConditionOptionCall<NotQueryBuilder> opLambda) {
-        NotQueryBuilder builder = QueryBuilders.notQuery(regTermQ("docId", docId));
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
+    public void setDocId_NotEqual(String docId, ConditionOptionCall<BoolQueryBuilder> opLambda) {
+        setDocId_NotTerm(docId, opLambda);
+    }
+
+    public void setDocId_NotTerm(String docId, ConditionOptionCall<BoolQueryBuilder> opLambda) {
+        not(not -> not.setDocId_Term(docId), opLambda);
     }
 
     public void setDocId_Terms(Collection<String> docIdList) {
@@ -685,19 +659,16 @@ public abstract class BsFavoriteLogCQ extends EsAbstractConditionQuery {
         setQueryId_NotTerm(queryId, null);
     }
 
-    public void setQueryId_NotEqual(String queryId, ConditionOptionCall<NotQueryBuilder> opLambda) {
-        setQueryId_NotTerm(queryId, opLambda);
-    }
-
     public void setQueryId_NotTerm(String queryId) {
         setQueryId_NotTerm(queryId, null);
     }
 
-    public void setQueryId_NotTerm(String queryId, ConditionOptionCall<NotQueryBuilder> opLambda) {
-        NotQueryBuilder builder = QueryBuilders.notQuery(regTermQ("queryId", queryId));
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
+    public void setQueryId_NotEqual(String queryId, ConditionOptionCall<BoolQueryBuilder> opLambda) {
+        setQueryId_NotTerm(queryId, opLambda);
+    }
+
+    public void setQueryId_NotTerm(String queryId, ConditionOptionCall<BoolQueryBuilder> opLambda) {
+        not(not -> not.setQueryId_Term(queryId), opLambda);
     }
 
     public void setQueryId_Terms(Collection<String> queryIdList) {
@@ -851,19 +822,16 @@ public abstract class BsFavoriteLogCQ extends EsAbstractConditionQuery {
         setUserInfoId_NotTerm(userInfoId, null);
     }
 
-    public void setUserInfoId_NotEqual(String userInfoId, ConditionOptionCall<NotQueryBuilder> opLambda) {
-        setUserInfoId_NotTerm(userInfoId, opLambda);
-    }
-
     public void setUserInfoId_NotTerm(String userInfoId) {
         setUserInfoId_NotTerm(userInfoId, null);
     }
 
-    public void setUserInfoId_NotTerm(String userInfoId, ConditionOptionCall<NotQueryBuilder> opLambda) {
-        NotQueryBuilder builder = QueryBuilders.notQuery(regTermQ("userInfoId", userInfoId));
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
+    public void setUserInfoId_NotEqual(String userInfoId, ConditionOptionCall<BoolQueryBuilder> opLambda) {
+        setUserInfoId_NotTerm(userInfoId, opLambda);
+    }
+
+    public void setUserInfoId_NotTerm(String userInfoId, ConditionOptionCall<BoolQueryBuilder> opLambda) {
+        not(not -> not.setUserInfoId_Term(userInfoId), opLambda);
     }
 
     public void setUserInfoId_Terms(Collection<String> userInfoIdList) {

src/main/java/org/codelibs/fess/es/log/cbean/cq/bs/BsSearchFieldLogCQ.java

@@ -21,14 +21,11 @@ import java.util.Collection;
 import org.codelibs.fess.es.log.allcommon.EsAbstractConditionQuery;
 import org.codelibs.fess.es.log.cbean.cq.SearchFieldLogCQ;
 import org.dbflute.cbean.ckey.ConditionKey;
-import org.dbflute.exception.IllegalConditionBeanOperationException;
 import org.elasticsearch.index.query.BoolQueryBuilder;
 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;
@@ -70,19 +67,8 @@ public abstract class BsSearchFieldLogCQ extends EsAbstractConditionQuery {
         not(notLambda, null);
     }
 
-    public void not(OperatorCall<SearchFieldLogCQ> notLambda, ConditionOptionCall<NotQueryBuilder> opLambda) {
-        SearchFieldLogCQ notQuery = new SearchFieldLogCQ();
-        notLambda.callback(notQuery);
-        if (notQuery.hasQueries()) {
-            if (notQuery.getQueryBuilderList().size() > 1) {
-                final String msg = "not query must be one query.";
-                throw new IllegalConditionBeanOperationException(msg);
-            }
-            NotQueryBuilder builder = QueryBuilders.notQuery(notQuery.getQueryBuilderList().get(0));
-            if (opLambda != null) {
-                opLambda.callback(builder);
-            }
-        }
+    public void not(final OperatorCall<SearchFieldLogCQ> notLambda, final ConditionOptionCall<BoolQueryBuilder> opLambda) {
+        bool((must, should, mustNot, filter) -> notLambda.callback(mustNot), opLambda);
     }
 
     public void bool(BoolCall<SearchFieldLogCQ> boolLambda) {
@@ -131,19 +117,16 @@ public abstract class BsSearchFieldLogCQ extends EsAbstractConditionQuery {
         setId_NotTerm(id, null);
     }
 
-    public void setId_NotEqual(String id, ConditionOptionCall<NotQueryBuilder> opLambda) {
-        setId_NotTerm(id, opLambda);
-    }
-
     public void setId_NotTerm(String id) {
         setId_NotTerm(id, null);
     }
 
-    public void setId_NotTerm(String id, ConditionOptionCall<NotQueryBuilder> opLambda) {
-        NotQueryBuilder builder = QueryBuilders.notQuery(regTermQ("_id", id));
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
+    public void setId_NotEqual(String id, ConditionOptionCall<BoolQueryBuilder> opLambda) {
+        setId_NotTerm(id, opLambda);
+    }
+
+    public void setId_NotTerm(String id, ConditionOptionCall<BoolQueryBuilder> opLambda) {
+        not(not -> not.setId_Term(id), opLambda);
     }
 
     public void setId_Terms(Collection<String> idList) {
@@ -198,19 +181,16 @@ public abstract class BsSearchFieldLogCQ extends EsAbstractConditionQuery {
         setName_NotTerm(name, null);
     }
 
-    public void setName_NotEqual(String name, ConditionOptionCall<NotQueryBuilder> opLambda) {
-        setName_NotTerm(name, opLambda);
-    }
-
     public void setName_NotTerm(String name) {
         setName_NotTerm(name, null);
     }
 
-    public void setName_NotTerm(String name, ConditionOptionCall<NotQueryBuilder> opLambda) {
-        NotQueryBuilder builder = QueryBuilders.notQuery(regTermQ("name", name));
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
+    public void setName_NotEqual(String name, ConditionOptionCall<BoolQueryBuilder> opLambda) {
+        setName_NotTerm(name, opLambda);
+    }
+
+    public void setName_NotTerm(String name, ConditionOptionCall<BoolQueryBuilder> opLambda) {
+        not(not -> not.setName_Term(name), opLambda);
     }
 
     public void setName_Terms(Collection<String> nameList) {
@@ -364,19 +344,16 @@ public abstract class BsSearchFieldLogCQ extends EsAbstractConditionQuery {
         setSearchLogId_NotTerm(searchLogId, null);
     }
 
-    public void setSearchLogId_NotEqual(String searchLogId, ConditionOptionCall<NotQueryBuilder> opLambda) {
-        setSearchLogId_NotTerm(searchLogId, opLambda);
-    }
-
     public void setSearchLogId_NotTerm(String searchLogId) {
         setSearchLogId_NotTerm(searchLogId, null);
     }
 
-    public void setSearchLogId_NotTerm(String searchLogId, ConditionOptionCall<NotQueryBuilder> opLambda) {
-        NotQueryBuilder builder = QueryBuilders.notQuery(regTermQ("searchLogId", searchLogId));
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
+    public void setSearchLogId_NotEqual(String searchLogId, ConditionOptionCall<BoolQueryBuilder> opLambda) {
+        setSearchLogId_NotTerm(searchLogId, opLambda);
+    }
+
+    public void setSearchLogId_NotTerm(String searchLogId, ConditionOptionCall<BoolQueryBuilder> opLambda) {
+        not(not -> not.setSearchLogId_Term(searchLogId), opLambda);
     }
 
     public void setSearchLogId_Terms(Collection<String> searchLogIdList) {
@@ -530,19 +507,16 @@ public abstract class BsSearchFieldLogCQ extends EsAbstractConditionQuery {
         setValue_NotTerm(value, null);
     }
 
-    public void setValue_NotEqual(String value, ConditionOptionCall<NotQueryBuilder> opLambda) {
-        setValue_NotTerm(value, opLambda);
-    }
-
     public void setValue_NotTerm(String value) {
         setValue_NotTerm(value, null);
     }
 
-    public void setValue_NotTerm(String value, ConditionOptionCall<NotQueryBuilder> opLambda) {
-        NotQueryBuilder builder = QueryBuilders.notQuery(regTermQ("value", value));
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
+    public void setValue_NotEqual(String value, ConditionOptionCall<BoolQueryBuilder> opLambda) {
+        setValue_NotTerm(value, opLambda);
+    }
+
+    public void setValue_NotTerm(String value, ConditionOptionCall<BoolQueryBuilder> opLambda) {
+        not(not -> not.setValue_Term(value), opLambda);
     }
 
     public void setValue_Terms(Collection<String> valueList) {

src/main/java/org/codelibs/fess/es/log/cbean/cq/bs/BsSearchLogCQ.java

@@ -21,14 +21,11 @@ import java.util.Collection;
 import org.codelibs.fess.es.log.allcommon.EsAbstractConditionQuery;
 import org.codelibs.fess.es.log.cbean.cq.SearchLogCQ;
 import org.dbflute.cbean.ckey.ConditionKey;
-import org.dbflute.exception.IllegalConditionBeanOperationException;
 import org.elasticsearch.index.query.BoolQueryBuilder;
 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;
@@ -70,19 +67,8 @@ public abstract class BsSearchLogCQ extends EsAbstractConditionQuery {
         not(notLambda, null);
     }
 
-    public void not(OperatorCall<SearchLogCQ> notLambda, ConditionOptionCall<NotQueryBuilder> opLambda) {
-        SearchLogCQ notQuery = new SearchLogCQ();
-        notLambda.callback(notQuery);
-        if (notQuery.hasQueries()) {
-            if (notQuery.getQueryBuilderList().size() > 1) {
-                final String msg = "not query must be one query.";
-                throw new IllegalConditionBeanOperationException(msg);
-            }
-            NotQueryBuilder builder = QueryBuilders.notQuery(notQuery.getQueryBuilderList().get(0));
-            if (opLambda != null) {
-                opLambda.callback(builder);
-            }
-        }
+    public void not(final OperatorCall<SearchLogCQ> notLambda, final ConditionOptionCall<BoolQueryBuilder> opLambda) {
+        bool((must, should, mustNot, filter) -> notLambda.callback(mustNot), opLambda);
     }
 
     public void bool(BoolCall<SearchLogCQ> boolLambda) {
@@ -131,19 +117,16 @@ public abstract class BsSearchLogCQ extends EsAbstractConditionQuery {
         setId_NotTerm(id, null);
     }
 
-    public void setId_NotEqual(String id, ConditionOptionCall<NotQueryBuilder> opLambda) {
-        setId_NotTerm(id, opLambda);
-    }
-
     public void setId_NotTerm(String id) {
         setId_NotTerm(id, null);
     }
 
-    public void setId_NotTerm(String id, ConditionOptionCall<NotQueryBuilder> opLambda) {
-        NotQueryBuilder builder = QueryBuilders.notQuery(regTermQ("_id", id));
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
+    public void setId_NotEqual(String id, ConditionOptionCall<BoolQueryBuilder> opLambda) {
+        setId_NotTerm(id, opLambda);
+    }
+
+    public void setId_NotTerm(String id, ConditionOptionCall<BoolQueryBuilder> opLambda) {
+        not(not -> not.setId_Term(id), opLambda);
     }
 
     public void setId_Terms(Collection<String> idList) {
@@ -198,19 +181,16 @@ public abstract class BsSearchLogCQ extends EsAbstractConditionQuery {
         setAccessType_NotTerm(accessType, null);
     }
 
-    public void setAccessType_NotEqual(String accessType, ConditionOptionCall<NotQueryBuilder> opLambda) {
-        setAccessType_NotTerm(accessType, opLambda);
-    }
-
     public void setAccessType_NotTerm(String accessType) {
         setAccessType_NotTerm(accessType, null);
     }
 
-    public void setAccessType_NotTerm(String accessType, ConditionOptionCall<NotQueryBuilder> opLambda) {
-        NotQueryBuilder builder = QueryBuilders.notQuery(regTermQ("accessType", accessType));
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
+    public void setAccessType_NotEqual(String accessType, ConditionOptionCall<BoolQueryBuilder> opLambda) {
+        setAccessType_NotTerm(accessType, opLambda);
+    }
+
+    public void setAccessType_NotTerm(String accessType, ConditionOptionCall<BoolQueryBuilder> opLambda) {
+        not(not -> not.setAccessType_Term(accessType), opLambda);
     }
 
     public void setAccessType_Terms(Collection<String> accessTypeList) {
@@ -364,19 +344,16 @@ public abstract class BsSearchLogCQ extends EsAbstractConditionQuery {
         setUser_NotTerm(user, null);
     }
 
-    public void setUser_NotEqual(String user, ConditionOptionCall<NotQueryBuilder> opLambda) {
-        setUser_NotTerm(user, opLambda);
-    }
-
     public void setUser_NotTerm(String user) {
         setUser_NotTerm(user, null);
     }
 
-    public void setUser_NotTerm(String user, ConditionOptionCall<NotQueryBuilder> opLambda) {
-        NotQueryBuilder builder = QueryBuilders.notQuery(regTermQ("user", user));
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
+    public void setUser_NotEqual(String user, ConditionOptionCall<BoolQueryBuilder> opLambda) {
+        setUser_NotTerm(user, opLambda);
+    }
+
+    public void setUser_NotTerm(String user, ConditionOptionCall<BoolQueryBuilder> opLambda) {
+        not(not -> not.setUser_Term(user), opLambda);
     }
 
     public void setUser_Terms(Collection<String> userList) {
@@ -530,19 +507,16 @@ public abstract class BsSearchLogCQ extends EsAbstractConditionQuery {
         setRoles_NotTerm(roles, null);
     }
 
-    public void setRoles_NotEqual(String roles, ConditionOptionCall<NotQueryBuilder> opLambda) {
-        setRoles_NotTerm(roles, opLambda);
-    }
-
     public void setRoles_NotTerm(String roles) {
         setRoles_NotTerm(roles, null);
     }
 
-    public void setRoles_NotTerm(String roles, ConditionOptionCall<NotQueryBuilder> opLambda) {
-        NotQueryBuilder builder = QueryBuilders.notQuery(regTermQ("roles", roles));
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
+    public void setRoles_NotEqual(String roles, ConditionOptionCall<BoolQueryBuilder> opLambda) {
+        setRoles_NotTerm(roles, opLambda);
+    }
+
+    public void setRoles_NotTerm(String roles, ConditionOptionCall<BoolQueryBuilder> opLambda) {
+        not(not -> not.setRoles_Term(roles), opLambda);
     }
 
     public void setRoles_Terms(Collection<String> rolesList) {
@@ -696,19 +670,16 @@ public abstract class BsSearchLogCQ extends EsAbstractConditionQuery {
         setQueryId_NotTerm(queryId, null);
     }
 
-    public void setQueryId_NotEqual(String queryId, ConditionOptionCall<NotQueryBuilder> opLambda) {
-        setQueryId_NotTerm(queryId, opLambda);
-    }
-
     public void setQueryId_NotTerm(String queryId) {
         setQueryId_NotTerm(queryId, null);
     }
 
-    public void setQueryId_NotTerm(String queryId, ConditionOptionCall<NotQueryBuilder> opLambda) {
-        NotQueryBuilder builder = QueryBuilders.notQuery(regTermQ("queryId", queryId));
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
+    public void setQueryId_NotEqual(String queryId, ConditionOptionCall<BoolQueryBuilder> opLambda) {
+        setQueryId_NotTerm(queryId, opLambda);
+    }
+
+    public void setQueryId_NotTerm(String queryId, ConditionOptionCall<BoolQueryBuilder> opLambda) {
+        not(not -> not.setQueryId_Term(queryId), opLambda);
     }
 
     public void setQueryId_Terms(Collection<String> queryIdList) {
@@ -862,19 +833,16 @@ public abstract class BsSearchLogCQ extends EsAbstractConditionQuery {
         setClientIp_NotTerm(clientIp, null);
     }
 
-    public void setClientIp_NotEqual(String clientIp, ConditionOptionCall<NotQueryBuilder> opLambda) {
-        setClientIp_NotTerm(clientIp, opLambda);
-    }
-
     public void setClientIp_NotTerm(String clientIp) {
         setClientIp_NotTerm(clientIp, null);
     }
 
-    public void setClientIp_NotTerm(String clientIp, ConditionOptionCall<NotQueryBuilder> opLambda) {
-        NotQueryBuilder builder = QueryBuilders.notQuery(regTermQ("clientIp", clientIp));
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
+    public void setClientIp_NotEqual(String clientIp, ConditionOptionCall<BoolQueryBuilder> opLambda) {
+        setClientIp_NotTerm(clientIp, opLambda);
+    }
+
+    public void setClientIp_NotTerm(String clientIp, ConditionOptionCall<BoolQueryBuilder> opLambda) {
+        not(not -> not.setClientIp_Term(clientIp), opLambda);
     }
 
     public void setClientIp_Terms(Collection<String> clientIpList) {
@@ -1028,19 +996,16 @@ public abstract class BsSearchLogCQ extends EsAbstractConditionQuery {
         setHitCount_NotTerm(hitCount, null);
     }
 
-    public void setHitCount_NotEqual(Long hitCount, ConditionOptionCall<NotQueryBuilder> opLambda) {
-        setHitCount_NotTerm(hitCount, opLambda);
-    }
-
     public void setHitCount_NotTerm(Long hitCount) {
         setHitCount_NotTerm(hitCount, null);
     }
 
-    public void setHitCount_NotTerm(Long hitCount, ConditionOptionCall<NotQueryBuilder> opLambda) {
-        NotQueryBuilder builder = QueryBuilders.notQuery(regTermQ("hitCount", hitCount));
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
+    public void setHitCount_NotEqual(Long hitCount, ConditionOptionCall<BoolQueryBuilder> opLambda) {
+        setHitCount_NotTerm(hitCount, opLambda);
+    }
+
+    public void setHitCount_NotTerm(Long hitCount, ConditionOptionCall<BoolQueryBuilder> opLambda) {
+        not(not -> not.setHitCount_Term(hitCount), opLambda);
     }
 
     public void setHitCount_Terms(Collection<Long> hitCountList) {
@@ -1183,19 +1148,16 @@ public abstract class BsSearchLogCQ extends EsAbstractConditionQuery {
         setQueryOffset_NotTerm(queryOffset, null);
     }
 
-    public void setQueryOffset_NotEqual(Integer queryOffset, ConditionOptionCall<NotQueryBuilder> opLambda) {
-        setQueryOffset_NotTerm(queryOffset, opLambda);
-    }
-
     public void setQueryOffset_NotTerm(Integer queryOffset) {
         setQueryOffset_NotTerm(queryOffset, null);
     }
 
-    public void setQueryOffset_NotTerm(Integer queryOffset, ConditionOptionCall<NotQueryBuilder> opLambda) {
-        NotQueryBuilder builder = QueryBuilders.notQuery(regTermQ("queryOffset", queryOffset));
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
+    public void setQueryOffset_NotEqual(Integer queryOffset, ConditionOptionCall<BoolQueryBuilder> opLambda) {
+        setQueryOffset_NotTerm(queryOffset, opLambda);
+    }
+
+    public void setQueryOffset_NotTerm(Integer queryOffset, ConditionOptionCall<BoolQueryBuilder> opLambda) {
+        not(not -> not.setQueryOffset_Term(queryOffset), opLambda);
     }
 
     public void setQueryOffset_Terms(Collection<Integer> queryOffsetList) {
@@ -1338,19 +1300,16 @@ public abstract class BsSearchLogCQ extends EsAbstractConditionQuery {
         setQueryPageSize_NotTerm(queryPageSize, null);
     }
 
-    public void setQueryPageSize_NotEqual(Integer queryPageSize, ConditionOptionCall<NotQueryBuilder> opLambda) {
-        setQueryPageSize_NotTerm(queryPageSize, opLambda);
-    }
-
     public void setQueryPageSize_NotTerm(Integer queryPageSize) {
         setQueryPageSize_NotTerm(queryPageSize, null);
     }
 
-    public void setQueryPageSize_NotTerm(Integer queryPageSize, ConditionOptionCall<NotQueryBuilder> opLambda) {
-        NotQueryBuilder builder = QueryBuilders.notQuery(regTermQ("queryPageSize", queryPageSize));
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
+    public void setQueryPageSize_NotEqual(Integer queryPageSize, ConditionOptionCall<BoolQueryBuilder> opLambda) {
+        setQueryPageSize_NotTerm(queryPageSize, opLambda);
+    }
+
+    public void setQueryPageSize_NotTerm(Integer queryPageSize, ConditionOptionCall<BoolQueryBuilder> opLambda) {
+        not(not -> not.setQueryPageSize_Term(queryPageSize), opLambda);
     }
 
     public void setQueryPageSize_Terms(Collection<Integer> queryPageSizeList) {
@@ -1493,19 +1452,16 @@ public abstract class BsSearchLogCQ extends EsAbstractConditionQuery {
         setReferer_NotTerm(referer, null);
     }
 
-    public void setReferer_NotEqual(String referer, ConditionOptionCall<NotQueryBuilder> opLambda) {
-        setReferer_NotTerm(referer, opLambda);
-    }
-
     public void setReferer_NotTerm(String referer) {
         setReferer_NotTerm(referer, null);
     }
 
-    public void setReferer_NotTerm(String referer, ConditionOptionCall<NotQueryBuilder> opLambda) {
-        NotQueryBuilder builder = QueryBuilders.notQuery(regTermQ("referer", referer));
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
+    public void setReferer_NotEqual(String referer, ConditionOptionCall<BoolQueryBuilder> opLambda) {
+        setReferer_NotTerm(referer, opLambda);
+    }
+
+    public void setReferer_NotTerm(String referer, ConditionOptionCall<BoolQueryBuilder> opLambda) {
+        not(not -> not.setReferer_Term(referer), opLambda);
     }
 
     public void setReferer_Terms(Collection<String> refererList) {
@@ -1659,19 +1615,16 @@ public abstract class BsSearchLogCQ extends EsAbstractConditionQuery {
         setRequestedAt_NotTerm(requestedAt, null);
     }
 
-    public void setRequestedAt_NotEqual(LocalDateTime requestedAt, ConditionOptionCall<NotQueryBuilder> opLambda) {
-        setRequestedAt_NotTerm(requestedAt, opLambda);
-    }
-
     public void setRequestedAt_NotTerm(LocalDateTime requestedAt) {
         setRequestedAt_NotTerm(requestedAt, null);
     }
 
-    public void setRequestedAt_NotTerm(LocalDateTime requestedAt, ConditionOptionCall<NotQueryBuilder> opLambda) {
-        NotQueryBuilder builder = QueryBuilders.notQuery(regTermQ("requestedAt", requestedAt));
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
+    public void setRequestedAt_NotEqual(LocalDateTime requestedAt, ConditionOptionCall<BoolQueryBuilder> opLambda) {
+        setRequestedAt_NotTerm(requestedAt, opLambda);
+    }
+
+    public void setRequestedAt_NotTerm(LocalDateTime requestedAt, ConditionOptionCall<BoolQueryBuilder> opLambda) {
+        not(not -> not.setRequestedAt_Term(requestedAt), opLambda);
     }
 
     public void setRequestedAt_Terms(Collection<LocalDateTime> requestedAtList) {
@@ -1814,19 +1767,16 @@ public abstract class BsSearchLogCQ extends EsAbstractConditionQuery {
         setResponseTime_NotTerm(responseTime, null);
     }
 
-    public void setResponseTime_NotEqual(Long responseTime, ConditionOptionCall<NotQueryBuilder> opLambda) {
-        setResponseTime_NotTerm(responseTime, opLambda);
-    }
-
     public void setResponseTime_NotTerm(Long responseTime) {
         setResponseTime_NotTerm(responseTime, null);
     }
 
-    public void setResponseTime_NotTerm(Long responseTime, ConditionOptionCall<NotQueryBuilder> opLambda) {
-        NotQueryBuilder builder = QueryBuilders.notQuery(regTermQ("responseTime", responseTime));
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
+    public void setResponseTime_NotEqual(Long responseTime, ConditionOptionCall<BoolQueryBuilder> opLambda) {
+        setResponseTime_NotTerm(responseTime, opLambda);
+    }
+
+    public void setResponseTime_NotTerm(Long responseTime, ConditionOptionCall<BoolQueryBuilder> opLambda) {
+        not(not -> not.setResponseTime_Term(responseTime), opLambda);
     }
 
     public void setResponseTime_Terms(Collection<Long> responseTimeList) {
@@ -1969,19 +1919,16 @@ public abstract class BsSearchLogCQ extends EsAbstractConditionQuery {
         setQueryTime_NotTerm(queryTime, null);
     }
 
-    public void setQueryTime_NotEqual(Long queryTime, ConditionOptionCall<NotQueryBuilder> opLambda) {
-        setQueryTime_NotTerm(queryTime, opLambda);
-    }
-
     public void setQueryTime_NotTerm(Long queryTime) {
         setQueryTime_NotTerm(queryTime, null);
     }
 
-    public void setQueryTime_NotTerm(Long queryTime, ConditionOptionCall<NotQueryBuilder> opLambda) {
-        NotQueryBuilder builder = QueryBuilders.notQuery(regTermQ("queryTime", queryTime));
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
+    public void setQueryTime_NotEqual(Long queryTime, ConditionOptionCall<BoolQueryBuilder> opLambda) {
+        setQueryTime_NotTerm(queryTime, opLambda);
+    }
+
+    public void setQueryTime_NotTerm(Long queryTime, ConditionOptionCall<BoolQueryBuilder> opLambda) {
+        not(not -> not.setQueryTime_Term(queryTime), opLambda);
     }
 
     public void setQueryTime_Terms(Collection<Long> queryTimeList) {
@@ -2124,19 +2071,16 @@ public abstract class BsSearchLogCQ extends EsAbstractConditionQuery {
         setSearchWord_NotTerm(searchWord, null);
     }
 
-    public void setSearchWord_NotEqual(String searchWord, ConditionOptionCall<NotQueryBuilder> opLambda) {
-        setSearchWord_NotTerm(searchWord, opLambda);
-    }
-
     public void setSearchWord_NotTerm(String searchWord) {
         setSearchWord_NotTerm(searchWord, null);
     }
 
-    public void setSearchWord_NotTerm(String searchWord, ConditionOptionCall<NotQueryBuilder> opLambda) {
-        NotQueryBuilder builder = QueryBuilders.notQuery(regTermQ("searchWord", searchWord));
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
+    public void setSearchWord_NotEqual(String searchWord, ConditionOptionCall<BoolQueryBuilder> opLambda) {
+        setSearchWord_NotTerm(searchWord, opLambda);
+    }
+
+    public void setSearchWord_NotTerm(String searchWord, ConditionOptionCall<BoolQueryBuilder> opLambda) {
+        not(not -> not.setSearchWord_Term(searchWord), opLambda);
     }
 
     public void setSearchWord_Terms(Collection<String> searchWordList) {
@@ -2290,19 +2234,16 @@ public abstract class BsSearchLogCQ extends EsAbstractConditionQuery {
         setUserAgent_NotTerm(userAgent, null);
     }
 
-    public void setUserAgent_NotEqual(String userAgent, ConditionOptionCall<NotQueryBuilder> opLambda) {
-        setUserAgent_NotTerm(userAgent, opLambda);
-    }
-
     public void setUserAgent_NotTerm(String userAgent) {
         setUserAgent_NotTerm(userAgent, null);
     }
 
-    public void setUserAgent_NotTerm(String userAgent, ConditionOptionCall<NotQueryBuilder> opLambda) {
-        NotQueryBuilder builder = QueryBuilders.notQuery(regTermQ("userAgent", userAgent));
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
+    public void setUserAgent_NotEqual(String userAgent, ConditionOptionCall<BoolQueryBuilder> opLambda) {
+        setUserAgent_NotTerm(userAgent, opLambda);
+    }
+
+    public void setUserAgent_NotTerm(String userAgent, ConditionOptionCall<BoolQueryBuilder> opLambda) {
+        not(not -> not.setUserAgent_Term(userAgent), opLambda);
     }
 
     public void setUserAgent_Terms(Collection<String> userAgentList) {
@@ -2456,19 +2397,16 @@ public abstract class BsSearchLogCQ extends EsAbstractConditionQuery {
         setUserInfoId_NotTerm(userInfoId, null);
     }
 
-    public void setUserInfoId_NotEqual(String userInfoId, ConditionOptionCall<NotQueryBuilder> opLambda) {
-        setUserInfoId_NotTerm(userInfoId, opLambda);
-    }
-
     public void setUserInfoId_NotTerm(String userInfoId) {
         setUserInfoId_NotTerm(userInfoId, null);
     }
 
-    public void setUserInfoId_NotTerm(String userInfoId, ConditionOptionCall<NotQueryBuilder> opLambda) {
-        NotQueryBuilder builder = QueryBuilders.notQuery(regTermQ("userInfoId", userInfoId));
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
+    public void setUserInfoId_NotEqual(String userInfoId, ConditionOptionCall<BoolQueryBuilder> opLambda) {
+        setUserInfoId_NotTerm(userInfoId, opLambda);
+    }
+
+    public void setUserInfoId_NotTerm(String userInfoId, ConditionOptionCall<BoolQueryBuilder> opLambda) {
+        not(not -> not.setUserInfoId_Term(userInfoId), opLambda);
     }
 
     public void setUserInfoId_Terms(Collection<String> userInfoIdList) {
@@ -2622,19 +2560,16 @@ public abstract class BsSearchLogCQ extends EsAbstractConditionQuery {
         setUserSessionId_NotTerm(userSessionId, null);
     }
 
-    public void setUserSessionId_NotEqual(String userSessionId, ConditionOptionCall<NotQueryBuilder> opLambda) {
-        setUserSessionId_NotTerm(userSessionId, opLambda);
-    }
-
     public void setUserSessionId_NotTerm(String userSessionId) {
         setUserSessionId_NotTerm(userSessionId, null);
     }
 
-    public void setUserSessionId_NotTerm(String userSessionId, ConditionOptionCall<NotQueryBuilder> opLambda) {
-        NotQueryBuilder builder = QueryBuilders.notQuery(regTermQ("userSessionId", userSessionId));
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
+    public void setUserSessionId_NotEqual(String userSessionId, ConditionOptionCall<BoolQueryBuilder> opLambda) {
+        setUserSessionId_NotTerm(userSessionId, opLambda);
+    }
+
+    public void setUserSessionId_NotTerm(String userSessionId, ConditionOptionCall<BoolQueryBuilder> opLambda) {
+        not(not -> not.setUserSessionId_Term(userSessionId), opLambda);
     }
 
     public void setUserSessionId_Terms(Collection<String> userSessionIdList) {

src/main/java/org/codelibs/fess/es/log/cbean/cq/bs/BsUserInfoCQ.java

@@ -21,13 +21,10 @@ import java.util.Collection;
 import org.codelibs.fess.es.log.allcommon.EsAbstractConditionQuery;
 import org.codelibs.fess.es.log.cbean.cq.UserInfoCQ;
 import org.dbflute.cbean.ckey.ConditionKey;
-import org.dbflute.exception.IllegalConditionBeanOperationException;
 import org.elasticsearch.index.query.BoolQueryBuilder;
 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.QueryBuilders;
 import org.elasticsearch.index.query.RangeQueryBuilder;
 import org.elasticsearch.index.query.TermQueryBuilder;
 import org.elasticsearch.index.query.TermsQueryBuilder;
@@ -69,19 +66,8 @@ public abstract class BsUserInfoCQ extends EsAbstractConditionQuery {
         not(notLambda, null);
     }
 
-    public void not(OperatorCall<UserInfoCQ> notLambda, ConditionOptionCall<NotQueryBuilder> opLambda) {
-        UserInfoCQ notQuery = new UserInfoCQ();
-        notLambda.callback(notQuery);
-        if (notQuery.hasQueries()) {
-            if (notQuery.getQueryBuilderList().size() > 1) {
-                final String msg = "not query must be one query.";
-                throw new IllegalConditionBeanOperationException(msg);
-            }
-            NotQueryBuilder builder = QueryBuilders.notQuery(notQuery.getQueryBuilderList().get(0));
-            if (opLambda != null) {
-                opLambda.callback(builder);
-            }
-        }
+    public void not(final OperatorCall<UserInfoCQ> notLambda, final ConditionOptionCall<BoolQueryBuilder> opLambda) {
+        bool((must, should, mustNot, filter) -> notLambda.callback(mustNot), opLambda);
     }
 
     public void bool(BoolCall<UserInfoCQ> boolLambda) {
@@ -130,19 +116,16 @@ public abstract class BsUserInfoCQ extends EsAbstractConditionQuery {
         setId_NotTerm(id, null);
     }
 
-    public void setId_NotEqual(String id, ConditionOptionCall<NotQueryBuilder> opLambda) {
-        setId_NotTerm(id, opLambda);
-    }
-
     public void setId_NotTerm(String id) {
         setId_NotTerm(id, null);
     }
 
-    public void setId_NotTerm(String id, ConditionOptionCall<NotQueryBuilder> opLambda) {
-        NotQueryBuilder builder = QueryBuilders.notQuery(regTermQ("_id", id));
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
+    public void setId_NotEqual(String id, ConditionOptionCall<BoolQueryBuilder> opLambda) {
+        setId_NotTerm(id, opLambda);
+    }
+
+    public void setId_NotTerm(String id, ConditionOptionCall<BoolQueryBuilder> opLambda) {
+        not(not -> not.setId_Term(id), opLambda);
     }
 
     public void setId_Terms(Collection<String> idList) {
@@ -197,19 +180,16 @@ public abstract class BsUserInfoCQ extends EsAbstractConditionQuery {
         setCreatedAt_NotTerm(createdAt, null);
     }
 
-    public void setCreatedAt_NotEqual(LocalDateTime createdAt, ConditionOptionCall<NotQueryBuilder> opLambda) {
-        setCreatedAt_NotTerm(createdAt, opLambda);
-    }
-
     public void setCreatedAt_NotTerm(LocalDateTime createdAt) {
         setCreatedAt_NotTerm(createdAt, null);
     }
 
-    public void setCreatedAt_NotTerm(LocalDateTime createdAt, ConditionOptionCall<NotQueryBuilder> opLambda) {
-        NotQueryBuilder builder = QueryBuilders.notQuery(regTermQ("createdAt", createdAt));
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
+    public void setCreatedAt_NotEqual(LocalDateTime createdAt, ConditionOptionCall<BoolQueryBuilder> opLambda) {
+        setCreatedAt_NotTerm(createdAt, opLambda);
+    }
+
+    public void setCreatedAt_NotTerm(LocalDateTime createdAt, ConditionOptionCall<BoolQueryBuilder> opLambda) {
+        not(not -> not.setCreatedAt_Term(createdAt), opLambda);
     }
 
     public void setCreatedAt_Terms(Collection<LocalDateTime> createdAtList) {
@@ -352,19 +332,16 @@ public abstract class BsUserInfoCQ extends EsAbstractConditionQuery {
         setUpdatedAt_NotTerm(updatedAt, null);
     }
 
-    public void setUpdatedAt_NotEqual(LocalDateTime updatedAt, ConditionOptionCall<NotQueryBuilder> opLambda) {
-        setUpdatedAt_NotTerm(updatedAt, opLambda);
-    }
-
     public void setUpdatedAt_NotTerm(LocalDateTime updatedAt) {
         setUpdatedAt_NotTerm(updatedAt, null);
     }
 
-    public void setUpdatedAt_NotTerm(LocalDateTime updatedAt, ConditionOptionCall<NotQueryBuilder> opLambda) {
-        NotQueryBuilder builder = QueryBuilders.notQuery(regTermQ("updatedAt", updatedAt));
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
+    public void setUpdatedAt_NotEqual(LocalDateTime updatedAt, ConditionOptionCall<BoolQueryBuilder> opLambda) {
+        setUpdatedAt_NotTerm(updatedAt, opLambda);
+    }
+
+    public void setUpdatedAt_NotTerm(LocalDateTime updatedAt, ConditionOptionCall<BoolQueryBuilder> opLambda) {
+        not(not -> not.setUpdatedAt_Term(updatedAt), opLambda);
     }
 
     public void setUpdatedAt_Terms(Collection<LocalDateTime> updatedAtList) {

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

@@ -37,7 +37,6 @@ import org.dbflute.dbmeta.accessory.DerivedTypeHandler;
 import org.dbflute.jdbc.StatementConfig;
 import org.dbflute.system.DBFluteSystem;
 import org.dbflute.twowaysql.style.BoundDateDisplayStyle;
-import org.elasticsearch.action.count.CountRequestBuilder;
 import org.elasticsearch.action.search.SearchRequestBuilder;
 import org.elasticsearch.common.unit.TimeValue;
 
@@ -57,8 +56,6 @@ public abstract class EsAbstractConditionBean implements ConditionBean {
     // ===================================================================================
     //                                                                             Builder
     //                                                                             =======
-    public abstract CountRequestBuilder build(CountRequestBuilder builder);
-
     public abstract SearchRequestBuilder build(SearchRequestBuilder builder);
 
     // ===================================================================================

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

@@ -476,6 +476,6 @@ public abstract class EsAbstractConditionQuery implements ConditionQuery {
     @FunctionalInterface
     public interface OperatorCall<CQ extends EsAbstractConditionQuery> {
 
-        void callback(CQ and);
+        void callback(CQ query);
     }
 }

src/main/java/org/codelibs/fess/es/user/cbean/bs/BsGroupCB.java

@@ -25,7 +25,6 @@ import org.codelibs.fess.es.user.cbean.GroupCB;
 import org.codelibs.fess.es.user.cbean.cq.GroupCQ;
 import org.codelibs.fess.es.user.cbean.cq.bs.BsGroupCQ;
 import org.dbflute.cbean.ConditionQuery;
-import org.elasticsearch.action.count.CountRequestBuilder;
 import org.elasticsearch.action.search.SearchRequestBuilder;
 import org.elasticsearch.index.query.QueryBuilder;
 
@@ -81,16 +80,6 @@ public class BsGroupCB extends EsAbstractConditionBean {
     // ===================================================================================
     //                                                                               Build
     //                                                                               =====
-    @Override
-    public CountRequestBuilder build(CountRequestBuilder builder) {
-        if (_conditionQuery != null) {
-            QueryBuilder queryBuilder = _conditionQuery.getQuery();
-            if (queryBuilder != null) {
-                builder.setQuery(queryBuilder);
-            }
-        }
-        return builder;
-    }
 
     @Override
     public SearchRequestBuilder build(SearchRequestBuilder builder) {

src/main/java/org/codelibs/fess/es/user/cbean/bs/BsRoleCB.java

@@ -25,7 +25,6 @@ import org.codelibs.fess.es.user.cbean.RoleCB;
 import org.codelibs.fess.es.user.cbean.cq.RoleCQ;
 import org.codelibs.fess.es.user.cbean.cq.bs.BsRoleCQ;
 import org.dbflute.cbean.ConditionQuery;
-import org.elasticsearch.action.count.CountRequestBuilder;
 import org.elasticsearch.action.search.SearchRequestBuilder;
 import org.elasticsearch.index.query.QueryBuilder;
 
@@ -81,16 +80,6 @@ public class BsRoleCB extends EsAbstractConditionBean {
     // ===================================================================================
     //                                                                               Build
     //                                                                               =====
-    @Override
-    public CountRequestBuilder build(CountRequestBuilder builder) {
-        if (_conditionQuery != null) {
-            QueryBuilder queryBuilder = _conditionQuery.getQuery();
-            if (queryBuilder != null) {
-                builder.setQuery(queryBuilder);
-            }
-        }
-        return builder;
-    }
 
     @Override
     public SearchRequestBuilder build(SearchRequestBuilder builder) {

src/main/java/org/codelibs/fess/es/user/cbean/bs/BsUserCB.java

@@ -25,7 +25,6 @@ import org.codelibs.fess.es.user.cbean.UserCB;
 import org.codelibs.fess.es.user.cbean.cq.UserCQ;
 import org.codelibs.fess.es.user.cbean.cq.bs.BsUserCQ;
 import org.dbflute.cbean.ConditionQuery;
-import org.elasticsearch.action.count.CountRequestBuilder;
 import org.elasticsearch.action.search.SearchRequestBuilder;
 import org.elasticsearch.index.query.QueryBuilder;
 
@@ -81,16 +80,6 @@ public class BsUserCB extends EsAbstractConditionBean {
     // ===================================================================================
     //                                                                               Build
     //                                                                               =====
-    @Override
-    public CountRequestBuilder build(CountRequestBuilder builder) {
-        if (_conditionQuery != null) {
-            QueryBuilder queryBuilder = _conditionQuery.getQuery();
-            if (queryBuilder != null) {
-                builder.setQuery(queryBuilder);
-            }
-        }
-        return builder;
-    }
 
     @Override
     public SearchRequestBuilder build(SearchRequestBuilder builder) {

src/main/java/org/codelibs/fess/es/user/cbean/cq/bs/BsGroupCQ.java

@@ -21,14 +21,11 @@ import java.util.Collection;
 import org.codelibs.fess.es.user.allcommon.EsAbstractConditionQuery;
 import org.codelibs.fess.es.user.cbean.cq.GroupCQ;
 import org.dbflute.cbean.ckey.ConditionKey;
-import org.dbflute.exception.IllegalConditionBeanOperationException;
 import org.elasticsearch.index.query.BoolQueryBuilder;
 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;
@@ -70,19 +67,8 @@ public abstract class BsGroupCQ extends EsAbstractConditionQuery {
         not(notLambda, null);
     }
 
-    public void not(OperatorCall<GroupCQ> notLambda, ConditionOptionCall<NotQueryBuilder> opLambda) {
-        GroupCQ notQuery = new GroupCQ();
-        notLambda.callback(notQuery);
-        if (notQuery.hasQueries()) {
-            if (notQuery.getQueryBuilderList().size() > 1) {
-                final String msg = "not query must be one query.";
-                throw new IllegalConditionBeanOperationException(msg);
-            }
-            NotQueryBuilder builder = QueryBuilders.notQuery(notQuery.getQueryBuilderList().get(0));
-            if (opLambda != null) {
-                opLambda.callback(builder);
-            }
-        }
+    public void not(final OperatorCall<GroupCQ> notLambda, final ConditionOptionCall<BoolQueryBuilder> opLambda) {
+        bool((must, should, mustNot, filter) -> notLambda.callback(mustNot), opLambda);
     }
 
     public void bool(BoolCall<GroupCQ> boolLambda) {
@@ -131,19 +117,16 @@ public abstract class BsGroupCQ extends EsAbstractConditionQuery {
         setId_NotTerm(id, null);
     }
 
-    public void setId_NotEqual(String id, ConditionOptionCall<NotQueryBuilder> opLambda) {
-        setId_NotTerm(id, opLambda);
-    }
-
     public void setId_NotTerm(String id) {
         setId_NotTerm(id, null);
     }
 
-    public void setId_NotTerm(String id, ConditionOptionCall<NotQueryBuilder> opLambda) {
-        NotQueryBuilder builder = QueryBuilders.notQuery(regTermQ("_id", id));
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
+    public void setId_NotEqual(String id, ConditionOptionCall<BoolQueryBuilder> opLambda) {
+        setId_NotTerm(id, opLambda);
+    }
+
+    public void setId_NotTerm(String id, ConditionOptionCall<BoolQueryBuilder> opLambda) {
+        not(not -> not.setId_Term(id), opLambda);
     }
 
     public void setId_Terms(Collection<String> idList) {
@@ -198,19 +181,16 @@ public abstract class BsGroupCQ extends EsAbstractConditionQuery {
         setName_NotTerm(name, null);
     }
 
-    public void setName_NotEqual(String name, ConditionOptionCall<NotQueryBuilder> opLambda) {
-        setName_NotTerm(name, opLambda);
-    }
-
     public void setName_NotTerm(String name) {
         setName_NotTerm(name, null);
     }
 
-    public void setName_NotTerm(String name, ConditionOptionCall<NotQueryBuilder> opLambda) {
-        NotQueryBuilder builder = QueryBuilders.notQuery(regTermQ("name", name));
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
+    public void setName_NotEqual(String name, ConditionOptionCall<BoolQueryBuilder> opLambda) {
+        setName_NotTerm(name, opLambda);
+    }
+
+    public void setName_NotTerm(String name, ConditionOptionCall<BoolQueryBuilder> opLambda) {
+        not(not -> not.setName_Term(name), opLambda);
     }
 
     public void setName_Terms(Collection<String> nameList) {
@@ -364,19 +344,16 @@ public abstract class BsGroupCQ extends EsAbstractConditionQuery {
         setGidNumber_NotTerm(gidNumber, null);
     }
 
-    public void setGidNumber_NotEqual(Long gidNumber, ConditionOptionCall<NotQueryBuilder> opLambda) {
-        setGidNumber_NotTerm(gidNumber, opLambda);
-    }
-
     public void setGidNumber_NotTerm(Long gidNumber) {
         setGidNumber_NotTerm(gidNumber, null);
     }
 
-    public void setGidNumber_NotTerm(Long gidNumber, ConditionOptionCall<NotQueryBuilder> opLambda) {
-        NotQueryBuilder builder = QueryBuilders.notQuery(regTermQ("gidNumber", gidNumber));
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
+    public void setGidNumber_NotEqual(Long gidNumber, ConditionOptionCall<BoolQueryBuilder> opLambda) {
+        setGidNumber_NotTerm(gidNumber, opLambda);
+    }
+
+    public void setGidNumber_NotTerm(Long gidNumber, ConditionOptionCall<BoolQueryBuilder> opLambda) {
+        not(not -> not.setGidNumber_Term(gidNumber), opLambda);
     }
 
     public void setGidNumber_Terms(Collection<Long> gidNumberList) {

src/main/java/org/codelibs/fess/es/user/cbean/cq/bs/BsRoleCQ.java

@@ -21,14 +21,11 @@ import java.util.Collection;
 import org.codelibs.fess.es.user.allcommon.EsAbstractConditionQuery;
 import org.codelibs.fess.es.user.cbean.cq.RoleCQ;
 import org.dbflute.cbean.ckey.ConditionKey;
-import org.dbflute.exception.IllegalConditionBeanOperationException;
 import org.elasticsearch.index.query.BoolQueryBuilder;
 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;
@@ -70,19 +67,8 @@ public abstract class BsRoleCQ extends EsAbstractConditionQuery {
         not(notLambda, null);
     }
 
-    public void not(OperatorCall<RoleCQ> notLambda, ConditionOptionCall<NotQueryBuilder> opLambda) {
-        RoleCQ notQuery = new RoleCQ();
-        notLambda.callback(notQuery);
-        if (notQuery.hasQueries()) {
-            if (notQuery.getQueryBuilderList().size() > 1) {
-                final String msg = "not query must be one query.";
-                throw new IllegalConditionBeanOperationException(msg);
-            }
-            NotQueryBuilder builder = QueryBuilders.notQuery(notQuery.getQueryBuilderList().get(0));
-            if (opLambda != null) {
-                opLambda.callback(builder);
-            }
-        }
+    public void not(final OperatorCall<RoleCQ> notLambda, final ConditionOptionCall<BoolQueryBuilder> opLambda) {
+        bool((must, should, mustNot, filter) -> notLambda.callback(mustNot), opLambda);
     }
 
     public void bool(BoolCall<RoleCQ> boolLambda) {
@@ -131,19 +117,16 @@ public abstract class BsRoleCQ extends EsAbstractConditionQuery {
         setId_NotTerm(id, null);
     }
 
-    public void setId_NotEqual(String id, ConditionOptionCall<NotQueryBuilder> opLambda) {
-        setId_NotTerm(id, opLambda);
-    }
-
     public void setId_NotTerm(String id) {
         setId_NotTerm(id, null);
     }
 
-    public void setId_NotTerm(String id, ConditionOptionCall<NotQueryBuilder> opLambda) {
-        NotQueryBuilder builder = QueryBuilders.notQuery(regTermQ("_id", id));
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
+    public void setId_NotEqual(String id, ConditionOptionCall<BoolQueryBuilder> opLambda) {
+        setId_NotTerm(id, opLambda);
+    }
+
+    public void setId_NotTerm(String id, ConditionOptionCall<BoolQueryBuilder> opLambda) {
+        not(not -> not.setId_Term(id), opLambda);
     }
 
     public void setId_Terms(Collection<String> idList) {
@@ -198,19 +181,16 @@ public abstract class BsRoleCQ extends EsAbstractConditionQuery {
         setName_NotTerm(name, null);
     }
 
-    public void setName_NotEqual(String name, ConditionOptionCall<NotQueryBuilder> opLambda) {
-        setName_NotTerm(name, opLambda);
-    }
-
     public void setName_NotTerm(String name) {
         setName_NotTerm(name, null);
     }
 
-    public void setName_NotTerm(String name, ConditionOptionCall<NotQueryBuilder> opLambda) {
-        NotQueryBuilder builder = QueryBuilders.notQuery(regTermQ("name", name));
-        if (opLambda != null) {
-            opLambda.callback(builder);
-        }
+    public void setName_NotEqual(String name, ConditionOptionCall<BoolQueryBuilder> opLambda) {
+        setName_NotTerm(name, opLambda);
+    }
+
+    public void setName_NotTerm(String name, ConditionOptionCall<BoolQueryBuilder> opLambda) {
+        not(not -> not.setName_Term(name), opLambda);
     }
 
     public void setName_Terms(Collection<String> nameList) {